From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 20 May 2013 16:37:58 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.1-alpha~184
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c90c370ab361ff0103becbd6fab9e1a9b5a460fe;p=thirdparty%2Ftor.git

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

c90c370ab361ff0103becbd6fab9e1a9b5a460fe