From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 10 Oct 2013 15:18:17 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.2-alpha~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d817fa29cb9a0f58dd641aabf7f34301bf5809d;p=thirdparty%2Ftor.git

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

3d817fa29cb9a0f58dd641aabf7f34301bf5809d