From: Roger Dingledine <arma@torproject.org>
Date: Wed, 11 May 2016 17:43:06 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~254
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad8b9dcd4713133fe840608e1ea98b09af6bc85a;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

ad8b9dcd4713133fe840608e1ea98b09af6bc85a