From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 7 Sep 2016 17:54:03 +0000 (-0400)
Subject: Merge branch 'maint-0.2.6' into maint-0.2.7
X-Git-Tag: tor-0.2.8.8~10^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11edbf480870975a354ec13ee67958492a0fd690;p=thirdparty%2Ftor.git

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

11edbf480870975a354ec13ee67958492a0fd690