Merge remote-tracking branch 'asn-mytor/bug4012_clienttransportplugin'
commit21dd6eae9eb6904586fc0f809a257943b85314be
authorNick Mathewson <nickm@torproject.org>
Mon, 7 Nov 2011 16:37:29 +0000 (7 11:37 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 7 Nov 2011 16:37:29 +0000 (7 11:37 -0500)
tree3c99f964412a6b0350493ff852513254b542c0c0
parent51f53b590ee15c972adcff9e7d94c904a9267ac2
parent1c532594e77aa22617c51b988a93084cfc0dc900
Merge remote-tracking branch 'asn-mytor/bug4012_clienttransportplugin'
doc/tor.1.txt