From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 7 Feb 2014 22:41:41 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.2-alpha~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a0577aacb4a94e803b4d9ec266e969f1aa5a88f3;p=thirdparty%2Ftor.git

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

a0577aacb4a94e803b4d9ec266e969f1aa5a88f3