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

Merge branch 'maint-0.2.8'
---

f54ffa463a5dd5ca41f253ce136d3e29b5e6aa20