From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 9 Apr 2014 12:29:21 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug10431'
X-Git-Tag: tor-0.2.5.4-alpha~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa6b80d6e510dd7027cc2dab50622bad4dc90064;p=thirdparty%2Ftor.git

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

fa6b80d6e510dd7027cc2dab50622bad4dc90064
diff --cc src/or/control.c
index 7f421a71d5,43c0539ddb..c91705257d
mode 100755,100644..100755
--- a/src/or/control.c
+++ b/src/or/control.c