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

[nickm at torproject.org]

commit 00d1093daf692b70d21d60f3333296097a01a376
Merge: 958ec0f f24638a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Mar 4 23:22:46 2017 -0500

    Merge branch 'feature21598_squashed'

 changes/feature21598 |  4 ++++
 src/or/rendservice.c | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)