[tor-commits] [sbws/master] Merge branch 'ticket26937_02' from juga, thanks

[pastly at torproject.org]

commit 75be1aa2060880bd534593d0bc6cd58d5f4db0de
Merge: 5e363d8 a9e4fbd
Author: Matt Traudt <sirmatt at ksu.edu>
Date:   Wed Sep 5 11:16:51 2018 -0400

    Merge branch 'ticket26937_02' from juga, thanks

 CHANGELOG.md |  6 +++++-
 INSTALL.rst  | 25 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)