From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 19 Jul 2016 10:31:20 +0000 (+0200)
Subject: Merge branch 'maint-0.2.4' into maint-0.2.5
X-Git-Tag: tor-0.2.5.13~18^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d95c2809b39fc45b7c30b0f29284bae7384c7224;p=thirdparty%2Ftor.git

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

d95c2809b39fc45b7c30b0f29284bae7384c7224