From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 6 Jun 2016 14:18:07 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~187
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c19a3d1bf893b19d73b3a9038162c403817034ac;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

c19a3d1bf893b19d73b3a9038162c403817034ac