From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 19 Mar 2013 20:17:42 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.1-alpha~248
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96e8e30ee3ea805b933af63459656644f2c60911;p=thirdparty%2Ftor.git

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

96e8e30ee3ea805b933af63459656644f2c60911