From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 19 May 2016 12:25:12 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~230
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d718c717a67051cb1da2a1f80c70401d0d10b374;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

d718c717a67051cb1da2a1f80c70401d0d10b374