From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 12 Nov 2014 15:23:55 +0000 (-0500)
Subject: Merge remote-tracking branch 'public/bug13698_024_v1'
X-Git-Tag: tor-0.2.6.2-alpha~97
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a87c697fb157f243bc48bba868a69a5182042822;p=thirdparty%2Ftor.git

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

a87c697fb157f243bc48bba868a69a5182042822