From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 8 Oct 2013 16:17:14 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.2-alpha~147
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1060688d2a351329ad6a4b751e312242b57531a0;p=thirdparty%2Ftor.git

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

1060688d2a351329ad6a4b751e312242b57531a0