From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 24 Mar 2016 14:14:05 +0000 (-0400)
Subject: Merge branch 'bug18517_squashed'
X-Git-Tag: tor-0.2.8.2-alpha~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=424af93ded7e1d9d98733ed17b2b6fee143262b9;p=thirdparty%2Ftor.git

Merge branch 'bug18517_squashed'
---

424af93ded7e1d9d98733ed17b2b6fee143262b9