[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/206'

[nickm at torproject.org]

commit 57d0b8c3cd7213f03b0a37c8c74c003b1c820438
Merge: c775689e9 5028a52b5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Aug 11 10:14:29 2018 -0400

    Merge remote-tracking branch 'tor-github/pr/206'

 INSTALL          | 34 ----------------------------------
 changes/doc26588 |  3 +++
 2 files changed, 3 insertions(+), 34 deletions(-)