commit 759de9f756cac3fb4034bfbbb7fd5195c0b24a34
Merge: 31f6806 938ee9b
Author: Nick Mathewson <[email protected]>
Date: Tue Sep 24 10:47:26 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug9776 | 5 +++++
src/or/channel.c | 9 ++++-----
src/or/connection_or.c | 10 ++++++++++
3 files changed, 19 insertions(+), 5 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
