From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 7 Apr 2015 19:15:54 +0000 (-0400)
Subject: Merge branch 'bug15604_squashed'
X-Git-Tag: tor-0.2.7.1-alpha~74
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=202bbfbaa4768ca34dbdff4931506823aa23f626;p=thirdparty%2Ftor.git

Merge branch 'bug15604_squashed'
---

202bbfbaa4768ca34dbdff4931506823aa23f626