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

[nickm at torproject.org]

commit f6261f0e32b60e078db5d393d51e8b8da4105593
Merge: 06cf12f abfd97f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 7 10:07:45 2011 -0400

    Merge remote-tracking branch 'asn/bug3578'

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