commit fe68a80f8f1e687d9e3dcdf6dfc5d0a8f3524335
Merge: 37f42c2 d7e4777
Author: Nick Mathewson <[email protected]>
Date: Wed May 30 17:00:36 2012 -0400
Merge branch 'bug5604'
changes/bug5604 | 4 ++++
src/or/config.c | 3 ++-
src/or/connection.c | 23 +++++++++++++++++++----
src/or/connection.h | 3 ++-
src/or/main.c | 2 +-
5 files changed, 28 insertions(+), 7 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
