[tor-commits] [tor/master] Merge branch 'bug5070_take2'
nickm at torproject.org
nickm at torproject.org
Mon May 7 15:06:41 UTC 2012
commit 120d524fba10fb3bea7caa762e3324e95bc9e529
Merge: c648f97 eefdb9e
Author: Nick Mathewson <nickm at torproject.org>
Date: Mon May 7 11:03:33 2012 -0400
Merge branch 'bug5070_take2'
changes/bug5070 | 3 ++
src/or/config.c | 4 +-
src/or/transports.c | 56 ++++++++++++++++++++++++++++++++++----------------
3 files changed, 43 insertions(+), 20 deletions(-)
More information about the tor-commits
mailing list