From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 16 May 2016 12:33:53 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~239
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5dbb0bdae934f56c34e48b52cecc973ea400805b;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

5dbb0bdae934f56c34e48b52cecc973ea400805b