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

[nickm@xxxxxxxxxxxxxx]

commit 8815960c4615da0015e78c3256c3f611a30f6e6c
Merge: 6edee54af 326b510ba
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Sep 6 09:47:32 2018 -0400

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

 changes/bug27044               |  5 +++++
 doc/tor.1.txt                  |  2 +-
 src/feature/rend/rendservice.c |  8 ++++++++
 src/test/test_controller.c     |  7 +++++++
 src/test/test_hs_config.c      | 14 ++++++++++++++
 5 files changed, 35 insertions(+), 1 deletion(-)

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