commit f97f301b5b5605f559522ffae2159fc4d061817c Merge: dc3890439 461e34bb3 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 1 12:13:39 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.8
changes/bug24480 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)