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

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

feeef00a6ad4629ab0d73b85195c0c9c8e9d57f0