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

[nickm@xxxxxxxxxxxxxx]

commit 328bcbf30568b811cedd8deb8a38d6b4bbe80130
Merge: a7d0cbd46 7ff67d0e9
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Sep 11 12:23:21 2018 -0400

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

 src/feature/hs/hs_client.c    | 7 +++----
 src/feature/hs/hs_service.c   | 7 +++----
 src/test/hs_test_helpers.c    | 6 +++---
 src/test/test_hs_descriptor.c | 2 ++
 src/test/test_hs_service.c    | 4 +---
 5 files changed, 12 insertions(+), 14 deletions(-)

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