From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 18 Apr 2014 19:25:36 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug9963_v2_024'
X-Git-Tag: tor-0.2.5.4-alpha~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0cca8dc35a4e59944b83db0a36c7033e09fb98b4;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/bug9963_v2_024'
---

0cca8dc35a4e59944b83db0a36c7033e09fb98b4
diff --cc src/or/control.c
index c91705257d,27aeab186e..2815b7901e
mode 100755,100644..100755
--- a/src/or/control.c
+++ b/src/or/control.c