From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 12 Aug 2016 14:27:08 +0000 (-0400)
Subject: Merge branch 'maint-0.2.6' into maint-0.2.7
X-Git-Tag: tor-0.2.9.2-alpha~36^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db372addc8534dc6e4639fe943179943b276b051;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.6' into maint-0.2.7
---

db372addc8534dc6e4639fe943179943b276b051