commit 5923418effc9a34176c07761d4540f338c2f1e03 Merge: f96f4c0 63d3ba9 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 5 08:57:00 2016 -0500

Merge remote-tracking branch 'jryans/service_is_ephemeral'

changes/20853 | 4 ++++ src/or/rendservice.c | 44 ++++++++++++++++++++++++++++++++------------ 2 files changed, 36 insertions(+), 12 deletions(-)