[tor-commits] [torspec/master] Merge remote-tracking branch 'asn/bug8403_take2'

[nickm at torproject.org]

commit bc96a0a220192b6a0d89d3e59c0b10af2751fecf
Merge: 17345bb 1648ca6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 14 12:45:00 2013 -0400

    Merge remote-tracking branch 'asn/bug8403_take2'

 .../xxx-pluggable-transports-through-proxy.txt     |   73 ++++++++++----------
 1 files changed, 36 insertions(+), 37 deletions(-)