From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 19 Oct 2014 18:35:29 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.3' into release-0.2.3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Frelease-0.2.3;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.3' into release-0.2.3
---

43836f6f0ab7c25b0c8c9fab366ec664ebd0b0ee