From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 2 Oct 2015 11:15:36 +0000 (+0200)
Subject: Merge remote-tracking branch 'sebastian/bug17026'
X-Git-Tag: tor-0.2.8.1-alpha~345
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b09322c9b388f68b26b891114affa869e84376c;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'sebastian/bug17026'
---

3b09322c9b388f68b26b891114affa869e84376c