From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 27 Jan 2015 17:42:12 +0000 (-0500)
Subject: Merge branch 'doc13702_squashed'
X-Git-Tag: tor-0.2.6.3-alpha~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e00503fe57e5459c6df57d993f3b3290e97262d9;p=thirdparty%2Ftor.git

Merge branch 'doc13702_squashed'
---

e00503fe57e5459c6df57d993f3b3290e97262d9