From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 30 Apr 2014 01:08:26 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.5-alpha~119
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27438ef7c6a34b71165480f4d2c9173278e6d854;p=thirdparty%2Ftor.git

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

Doing an "ours" merge to avoid taking 35699ef9f5d2814203653e16c, which is
a cherry-picked backport of 9686.
---

27438ef7c6a34b71165480f4d2c9173278e6d854