From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 9 Mar 2016 15:36:20 +0000 (-0500)
Subject: Merge branch 'maint-0.2.4' into maint-0.2.5
X-Git-Tag: tor-0.2.5.13~22^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=21f9829e793fd9074c568ffffbee548e345536df;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.4' into maint-0.2.5
---

21f9829e793fd9074c568ffffbee548e345536df