From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 5 Apr 2013 20:53:07 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.1-alpha~225
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=55817c4c5065a7689e17c329b3f4695b6d888220;p=thirdparty%2Ftor.git

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

55817c4c5065a7689e17c329b3f4695b6d888220