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

Merge branch 'maint-0.2.8'
---

6a7d11f38a01b315fb5d7da9ad1d271991d2644e