From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 2 May 2016 17:53:37 +0000 (-0400)
Subject: Merge branch 'bug18240_squashed'
X-Git-Tag: tor-0.2.9.1-alpha~277
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9081bdb74a459f5cf4d6a03ec6619b1bd5e89e8;p=thirdparty%2Ftor.git

Merge branch 'bug18240_squashed'
---

c9081bdb74a459f5cf4d6a03ec6619b1bd5e89e8