commit 82ab33c9a66a9c45e9512b698ef203b1aaca7a3d
Merge: 8f21838 bae5dd6
Author: Nick Mathewson <ni...@torproject.org>
Date: Thu May 9 13:20:01 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug8844 | 6 ++++++
src/or/buffers.c | 3 ++-
src/test/test.c | 12 ++++++++++++
3 files changed, 20 insertions(+), 1 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
