From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 28 Mar 2016 20:14:21 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~310
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3220bd816b1a20eeb8bcaf562dc5382439bb00f7;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

3220bd816b1a20eeb8bcaf562dc5382439bb00f7