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

Merge branch 'bug18673_028_v2' into maint-0.2.8
---

f780d196a91b8c9c5c2581d37326599b4e97b945