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

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

60fd08f40be9bfe3e53de4e22b66f25451206f96