[tor-commits] [tor/master] Merge branch 'tor-github/pr/1233'

[asn at torproject.org]

commit af7cf7d5c103e649bdd0b58a34ee83cddcbb1b99
Merge: dfc8c0b53 e87e34099
Author: George Kadianakis <desnacked at riseup.net>
Date:   Mon Aug 19 18:05:22 2019 +0300

    Merge branch 'tor-github/pr/1233'

 doc/tor.1.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)