From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 25 Aug 2013 04:33:10 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
X-Git-Tag: tor-0.2.4.17-rc~7^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5610cfa64189db693dbad3efaa973d6720c42fe;p=thirdparty%2Ftor.git

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

(Using "ours" strategy to avoid taking 9546 fix in 0.2.3; we just
merged our own into 0.2.4)
---

a5610cfa64189db693dbad3efaa973d6720c42fe