commit 8ff2a8c0e2e5bc19de23adf131d726287319a276 Merge: 7bc636f 74f7657 Author: Nick Mathewson nickm@torproject.org Date: Mon Apr 24 09:30:30 2017 -0400

Merge remote-tracking branch 'dgoulet/bug22032_031_01'

src/or/rendservice.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)