From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 8 Oct 2013 20:09:45 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.2-alpha~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30b8fc3e0d5a2eafa052672619aaaac733f3fa3d;p=thirdparty%2Ftor.git

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

Using "ours" strategy since we already merged the equivalent of #9866
into this branch.
---

30b8fc3e0d5a2eafa052672619aaaac733f3fa3d