commit 314652dc16ece380de343ccdc5a2155d612bcff7 Merge: f7b06202c 0ec72b030 Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 18 09:39:46 2017 -0400
Merge branch 'maint-0.2.8' into maint-0.2.9
changes/trove-2017-008 | 5 +++++ src/or/rendservice.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)