From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 7 Jul 2016 16:44:07 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=663b659434267f1c8edb1a130f10d6f3a91da831;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

663b659434267f1c8edb1a130f10d6f3a91da831