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

[nickm at torproject.org]

commit 1858712e6f0e735d13b66d68515ed7950808f919
Merge: adb2bf3 c4b8d1f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 14 10:58:57 2011 -0400

    Merge remote-tracking branch 'asn-http/proposal_180'

 proposals/180-pluggable-transport.txt |  142 ++++++++++++++++++++-------------
 1 files changed, 85 insertions(+), 57 deletions(-)