From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 9 May 2016 18:56:56 +0000 (-0400)
Subject: Merge branch 'maint-0.2.6' into maint-0.2.7
X-Git-Tag: tor-0.2.8.3-alpha~36^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7fe80c29056d7e98b9443e151343c886cf8c7dd3;p=thirdparty%2Ftor.git

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

7fe80c29056d7e98b9443e151343c886cf8c7dd3