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

[nickm at torproject.org]

commit b5ad8d69ee9ca9219220b4eca6ca7b46ce5c42af
Merge: 87ad7d4 8a1ed07
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 9 13:17:18 2011 -0400

    Merge remote-tracking branch 'asn/bug3656'

 proposals/180-pluggable-transport.txt |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)