From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 7 Apr 2015 18:05:52 +0000 (-0400)
Subject: Merge branch 'doc15550_squashed'
X-Git-Tag: tor-0.2.7.1-alpha~76
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1457364c497d5a455d41d95118caad342d63bb8f;p=thirdparty%2Ftor.git

Merge branch 'doc15550_squashed'
---

1457364c497d5a455d41d95118caad342d63bb8f