From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 30 Oct 2015 13:25:51 +0000 (-0400)
Subject: Merge branch 'doc17392'
X-Git-Tag: tor-0.2.8.1-alpha~260
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0696ac5b5e5d5d63c0fbc493f6e96276c7aaa837;p=thirdparty%2Ftor.git

Merge branch 'doc17392'
---

0696ac5b5e5d5d63c0fbc493f6e96276c7aaa837