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

[nickm at torproject.org]

commit 21dd6eae9eb6904586fc0f809a257943b85314be
Merge: 51f53b5 1c53259
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 7 11:37:29 2011 -0500

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

 doc/tor.1.txt |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)