From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 2 Apr 2014 00:59:13 +0000 (-0400)
Subject: Merge branch 'bug9213_doc_024' into maint-0.2.4
X-Git-Tag: tor-0.2.5.4-alpha~83^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=48578e1512f2d5fa95e4fdde0564d2db8ee7f995;p=thirdparty%2Ftor.git

Merge branch 'bug9213_doc_024' into maint-0.2.4
---

48578e1512f2d5fa95e4fdde0564d2db8ee7f995