commit b86c9acac360c23749f007c29f1bdd7b8347c18d Merge: 909c91049 5c03bb7c0 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 1 12:13:40 2017 -0500
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/bug24480 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)