From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 16 Jul 2014 09:01:20 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/maint-0.2.5'
X-Git-Tag: tor-0.2.6.1-alpha~244
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7591ce64fbaae8d480224a93d62abda10011c2ba;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.5'
---

7591ce64fbaae8d480224a93d62abda10011c2ba
diff --cc src/or/router.c
index 4fcd4a5b89,2cdbb0c8bb..4fcd4a5b89
mode 100755,100644..100644
--- a/src/or/router.c
+++ b/src/or/router.c