From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 6 Feb 2014 21:29:33 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.2-alpha~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5990edd1952361faca4619728b50587061d81be7;p=thirdparty%2Ftor.git

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

5990edd1952361faca4619728b50587061d81be7