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

Merge branch 'maint-0.2.8'
---

e24c9022722119f4d0d631c7e4d02e347b9dc83d