commit 8e2cfca81a0e67ee90c8df55e97da02fe71494f7 Merge: 5380544 3fe1797 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 15 12:20:39 2013 -0400

Merge branch 'bug7751_take2_squashed'

proposals/196-transport-control-ports.txt | 36 ++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-)