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

Merge branch 'maint-0.2.8'
---

2384256a3719fbc31793228b0b34716b7817d15e