From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 7 Feb 2017 13:34:08 +0000 (-0500)
Subject: Merge branch 'maint-0.2.4' into maint-0.2.5
X-Git-Tag: tor-0.2.5.13~12^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=332543baedcf651b75722e5d4626c62fdd24ef60;p=thirdparty%2Ftor.git

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

332543baedcf651b75722e5d4626c62fdd24ef60