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

Merge branch 'maint-0.2.8'
---

230a3d1400939eddf17c3df26e398104a38f5fb1