From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 6 Oct 2016 13:59:18 +0000 (-0400)
Subject: Merge branch 'maint-0.2.6' into maint-0.2.7
X-Git-Tag: tor-0.2.8.9~3^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec718aa83914e848ca9ee5e828731477a410e484;p=thirdparty%2Ftor.git

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

ec718aa83914e848ca9ee5e828731477a410e484