From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 29 Apr 2014 17:03:27 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.5-alpha~125
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0514bcd37c6e6e0eb3f3c47da94cb182d01ef15f;p=thirdparty%2Ftor.git

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

0514bcd37c6e6e0eb3f3c47da94cb182d01ef15f