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

Merge branch 'maint-0.2.8'
---

79f9e63ebf2bbe855af381cb49d5fbeb47ec0880