From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 7 Sep 2016 17:53:43 +0000 (-0400)
Subject: Merge branch 'maint-0.2.4' into maint-0.2.5
X-Git-Tag: tor-0.2.5.13~18^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4d82da05b11a78da4858050b6d1e8d922842ca3;p=thirdparty%2Ftor.git

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

e4d82da05b11a78da4858050b6d1e8d922842ca3