[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket23480_032_01'

[nickm at torproject.org]

commit d71a00e91f3921f6bdf160811313e7b32f890b6c
Merge: 6c5c74e11 98953b1fc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 12 11:20:27 2017 -0400

    Merge remote-tracking branch 'dgoulet/ticket23480_032_01'

 src/or/hs_cache.c   |  6 ++----
 src/or/hs_service.c | 10 ++++++++--
 src/or/nodelist.c   |  6 ++++--
 3 files changed, 14 insertions(+), 8 deletions(-)