From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 22 Oct 2014 15:01:50 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug11824_v2'
X-Git-Tag: tor-0.2.6.1-alpha~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=653221e807fb07ce20e70566f95c6d27c284990e;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/bug11824_v2'
---

653221e807fb07ce20e70566f95c6d27c284990e