From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 2 Feb 2015 18:32:53 +0000 (-0500)
Subject: Merge branch 'feature13864_squashed'
X-Git-Tag: tor-0.2.6.3-alpha~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79c7625e38893920a80451ba420ee45ccd67f79b;p=thirdparty%2Ftor.git

Merge branch 'feature13864_squashed'
---

79c7625e38893920a80451ba420ee45ccd67f79b