[tor-commits] [tor/master] Merge branch 'bug5609_rebased'

[nickm at torproject.org]

commit 34179395657c478527bff8cdb94d9d142013494a
Merge: 2452302 078d6bc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Aug 25 11:32:55 2013 -0400

    Merge branch 'bug5609_rebased'

 changes/bug5609     |    4 +++
 src/or/control.c    |   76 ++++++++++++++++++++-------------------------------
 src/or/control.h    |   56 +++++++++++++++++++++++++++++++++++++
 src/or/transports.c |    4 +++
 src/test/test_pt.c  |   44 +++++++++++++++++++++++++++++
 5 files changed, 137 insertions(+), 47 deletions(-)