[tor-commits] [tor/master] Merge branch 'bug15554_032_01_squashed'

[nickm at torproject.org]

commit 46e83477c15d547e0a8d3df2926adf8ee10b77a6
Merge: 13ccca6 78ac713
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 5 10:15:24 2017 -0400

    Merge branch 'bug15554_032_01_squashed'

 changes/15554       |  4 +++
 src/or/rendcommon.c |  4 ++-
 src/or/rendcommon.h |  7 ++++
 src/test/test_hs.c  | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 4 files changed, 108 insertions(+), 5 deletions(-)