From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 26 Mar 2016 12:17:19 +0000 (-0400)
Subject: Merge branch 'bug18649_squashed'
X-Git-Tag: tor-0.2.8.2-alpha~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c81b1358e706da65b5a513bc8fd851c62e0645b0;p=thirdparty%2Ftor.git

Merge branch 'bug18649_squashed'
---

c81b1358e706da65b5a513bc8fd851c62e0645b0