From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 1 May 2014 15:45:38 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.5-alpha~112
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9da17ad410b0b510c2e8cdaa2168fd020f3dc8c2;p=thirdparty%2Ftor.git

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

(this is an "ours" merge, to avoid taking 6a4f5d9b4d into 0.2.5: that
commit downgrades the bug 7164 warning in versions <= 0.2.4 because it
isn't as useful as the one 0.2.5 has)
---

9da17ad410b0b510c2e8cdaa2168fd020f3dc8c2