From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 29 Mar 2016 00:09:22 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~308
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90c24c0ced62a36c3100e49ad404b3519ba1cd77;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

90c24c0ced62a36c3100e49ad404b3519ba1cd77