From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 13 Aug 2014 16:51:27 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
X-Git-Tag: tor-0.2.4.24~1^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=244ca67e47238ae8f687c4d4038b7f696824b023;p=thirdparty%2Ftor.git

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

244ca67e47238ae8f687c4d4038b7f696824b023