From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 26 Oct 2015 13:18:48 +0000 (-0400)
Subject: Merge remote-tracking branch 'rl1987/bug17417_take2'
X-Git-Tag: tor-0.2.8.1-alpha~264
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=19e10f95c105a698d3593a1ecfa88a7449a21127;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'rl1987/bug17417_take2'
---

19e10f95c105a698d3593a1ecfa88a7449a21127