From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 6 Jul 2016 14:17:22 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c1d8cdd8d22f4004a0dec144527d73656bace2d;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

9c1d8cdd8d22f4004a0dec144527d73656bace2d