commit a2aaf9509ba578f4e7705b506ee9a0f764d24ff2
Merge: 36567c5ca 490ae26b2
Author: Nick Mathewson <ni...@torproject.org>
Date: Fri Jan 19 16:29:15 2018 -0500
Merge remote-tracking branch 'dgoulet/bug24895_029_02' into maint-0.2.9
changes/bug24895 | 8 ++++++++
src/or/rendservice.c | 29 ++++++++++++++++++++++++-----
2 files changed, 32 insertions(+), 5 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
