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

[nickm at torproject.org]

commit a0ebc28b97f6f452eb95c86e3bd2b9099b0c5eae
Merge: 28a7838 435b5bc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 15 18:13:15 2012 -0400

    Merge remote-tracking branch 'asn/bug4773'

 proposals/xxx-transport-control-ports.txt |  185 +++++++++++++++++++++++++++++
 1 files changed, 185 insertions(+), 0 deletions(-)