commit fe2552ad652e07cd2e654b3e91f7b24a1ce8200b Merge: 13e93bdfd c142e3d1e Author: George Kadianakis <desnacked@riseup.net> Date: Mon Mar 4 18:52:19 2019 +0200 Merge branch 'tor-github/pr/739' changes/bug17357 | 7 +++++++ src/feature/rend/rendservice.c | 26 ++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-)