From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 11 May 2016 16:36:55 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~260
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71267bef4c64b791346f8cdd54f3be4cc3fc38ca;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

71267bef4c64b791346f8cdd54f3be4cc3fc38ca