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

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

1bbfadfa6158064a86533323a50be60d4c93934e