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

Merge branch 'maint-0.2.8'
---

903ec20c0b4e3bc5de9fe7925380cbf87c107058