From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 20 Jan 2015 18:46:56 +0000 (-0500)
Subject: Merge branch 'ticket14254_squashed'
X-Git-Tag: tor-0.2.6.3-alpha~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da423532f7ac9d275d6b0cf62038a86b04d415ac;p=thirdparty%2Ftor.git

Merge branch 'ticket14254_squashed'
---

da423532f7ac9d275d6b0cf62038a86b04d415ac