From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 17 May 2016 15:10:20 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~235
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6382cd93cb99d1f5cff62bfe7759eca8a6948782;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

6382cd93cb99d1f5cff62bfe7759eca8a6948782