From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 11 Mar 2016 16:11:38 +0000 (-0500)
Subject: Merge remote-tracking branch 'teor/bug8976_01_028'
X-Git-Tag: tor-0.2.8.2-alpha~69
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe0d346a6df3d20f81a90c4cfe4de89046907961;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'teor/bug8976_01_028'
---

fe0d346a6df3d20f81a90c4cfe4de89046907961