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

Merge branch 'maint-0.2.8'
---

9932544297e02dc4f79d70317f214bcbb2dd8e9a