From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 17 Oct 2016 18:51:45 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.4-alpha~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a7488106326d2327fc24f32b13979b7029b813b;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

1a7488106326d2327fc24f32b13979b7029b813b