From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 9 Dec 2016 13:34:12 +0000 (-0500)
Subject: Merge branch 'maint-0.2.6' into maint-0.2.7
X-Git-Tag: tor-0.2.8.12~6^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b49369badd28d5895f1d26b74be888298246b05a;p=thirdparty%2Ftor.git

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

b49369badd28d5895f1d26b74be888298246b05a