From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 24 Sep 2013 14:47:26 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.1-alpha~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=759de9f756cac3fb4034bfbbb7fd5195c0b24a34;p=thirdparty%2Ftor.git

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

759de9f756cac3fb4034bfbbb7fd5195c0b24a34