From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 17 Feb 2015 17:34:13 +0000 (-0500)
Subject: Merge remote-tracking branch 'public/feature_13822'
X-Git-Tag: tor-0.2.6.3-alpha~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9bf6da1861f8cd67a40ea4f24a12d09413a8926f;p=thirdparty%2Ftor.git

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

9bf6da1861f8cd67a40ea4f24a12d09413a8926f