From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 5 Apr 2016 14:38:53 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~298
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b46d126e647a0789d362036e9a4d957f0d916aff;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

b46d126e647a0789d362036e9a4d957f0d916aff