From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 7 Apr 2016 14:59:55 +0000 (-0400)
Subject: Merge branch 'bug14334_squashed'
X-Git-Tag: tor-0.2.9.1-alpha~293
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=591029253f4b79de0ecd47c464623b0ce13270ef;p=thirdparty%2Ftor.git

Merge branch 'bug14334_squashed'
---

591029253f4b79de0ecd47c464623b0ce13270ef