From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 22 Sep 2016 19:17:00 +0000 (-0400)
Subject: Merge branch 'bug20203_027_squashed' into maint-0.2.8
X-Git-Tag: tor-0.2.8.8~6^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e96eababe8f05ac03b2e83911e6fae5654884b4;p=thirdparty%2Ftor.git

Merge branch 'bug20203_027_squashed' into maint-0.2.8
---

6e96eababe8f05ac03b2e83911e6fae5654884b4