From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 25 May 2016 20:40:51 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~211
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28cbcd033cadc9dfcabf4e179fc3649d8ec595e2;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

28cbcd033cadc9dfcabf4e179fc3649d8ec595e2