From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 5 Jul 2016 17:53:28 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85c39b647dbd4483da469b029f2273b8d2ae11bd;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

85c39b647dbd4483da469b029f2273b8d2ae11bd