commit 120d524fba10fb3bea7caa762e3324e95bc9e529 Merge: c648f97 eefdb9e Author: Nick Mathewson nickm@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(-)