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

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

80c987fbb41fb7299cf4fe8b04d6190c581bd158