[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug18604_029_01'

[nickm at torproject.org]

commit 9a63f059b9eefa910a8c74b4936623dd37e946dd
Merge: a8c7662 ab35f9d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 17 09:07:41 2016 -0400

    Merge remote-tracking branch 'dgoulet/bug18604_029_01'

 changes/bug18604     | 4 ++++
 src/or/rendservice.c | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)