From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 29 Sep 2014 17:02:35 +0000 (-0400)
Subject: Merge branch 'bug13295_v2_025' into maint-0.2.5
X-Git-Tag: tor-0.2.6.1-alpha~62^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e1a25f0c3602e007872277ef9ab437cc97cfd47b;p=thirdparty%2Ftor.git

Merge branch 'bug13295_v2_025' into maint-0.2.5
---

e1a25f0c3602e007872277ef9ab437cc97cfd47b