From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 7 Jan 2015 18:19:57 +0000 (-0500)
Subject: Merge branch 'ticket14128_squashed'
X-Git-Tag: tor-0.2.6.3-alpha~190
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ceed53c39b19488e3c62f06f79a3e60b0ec38184;p=thirdparty%2Ftor.git

Merge branch 'ticket14128_squashed'
---

ceed53c39b19488e3c62f06f79a3e60b0ec38184