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

[nickm@xxxxxxxxxxxxxx]

commit de7fcae72a2de3ba8bb8025051ee43ebe07876bb
Merge: bca30bcb9 e8e42f4af
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Oct 3 09:08:23 2019 -0400

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

 changes/bug28966           |  4 ++++
 doc/tor.1.txt              | 53 ++++++++++++++++++++++++++++------------------
 src/feature/hs/hs_config.c | 10 +++++++++
 3 files changed, 46 insertions(+), 21 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits