[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug9963_v2_024'

[nickm at torproject.org]

commit 0cca8dc35a4e59944b83db0a36c7033e09fb98b4
Merge: b8fe8ee 5b36f0d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Apr 18 15:25:36 2014 -0400

    Merge remote-tracking branch 'public/bug9963_v2_024'

 changes/bug9963  |    5 +++++
 src/or/control.c |   35 +++++++++++++++++++++++++++++++----
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --cc src/or/control.c
index c917052,27aeab1..2815b79
mode 100755,100644..100755
--- a/src/or/control.c
+++ b/src/or/control.c