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

Merge branch 'maint-0.2.8'
---

8c1c71aa2c941d7defd8874f49e541b0f185f6b3