From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 8 Jun 2017 13:21:15 +0000 (-0400)
Subject: Merge branch 'maint-0.2.5' into maint-0.2.6
X-Git-Tag: tor-0.2.6.12~2^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=40bccc20042fcc4f43964b358257470830169e73;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.5' into maint-0.2.6
---

40bccc20042fcc4f43964b358257470830169e73