[tor-commits] [tor/master] Merge remote-tracking branch 'asn-mytor/bug4726'

[nickm at torproject.org]

commit 37504b5efae2e1423ec09eae6fc6d1e229987e3d
Merge: 597e428 6d35f08
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Dec 17 12:49:15 2011 -0500

    Merge remote-tracking branch 'asn-mytor/bug4726'

 src/or/transports.c |  155 +++++++++++++++++++++++++--------------------------
 1 files changed, 77 insertions(+), 78 deletions(-)