commit d73755e36e83f30e9a961029b6eaba34c3935845 Merge: efa5bba 4ed10e5 Author: Nick Mathewson nickm@torproject.org Date: Fri Feb 24 11:37:04 2017 -0500

Merge branch 'maint-0.3.0'

changes/bug21553 | 7 +++++++ src/or/rendservice.c | 12 +++++++----- src/or/rendservice.h | 1 + src/test/test_hs_intropoint.c | 1 + 4 files changed, 16 insertions(+), 5 deletions(-)