From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 15 Jun 2016 00:16:46 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~169
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8486dea8d7f2d363c4d0d3d093319caa5c728f4e;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

8486dea8d7f2d363c4d0d3d093319caa5c728f4e