commit 63ab5f4849620cee81c578d231174bf9f846d740 Merge: d39f713 97246a5 Author: Nick Mathewson <[email protected]> Date: Fri Apr 12 01:14:32 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug5650 | 5 +++++
src/or/connection.c | 17 ++++++++++++++++-
src/or/or.h | 3 +++
3 files changed, 24 insertions(+), 1 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
