commit f38f9b33d0bf52583491cdea6f41eb51819c627b Merge: c000c7d f1dd64b Author: Nick Mathewson <nickm@torproject.org> Date: Tue Mar 14 12:07:30 2017 -0400 Merge branch 'feature21622_only' changes/feature21622 | 8 ++++++++ src/or/rendservice.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 56 insertions(+), 2 deletions(-)