[tor-commits] [tor/master] Merge remote-tracking branch 'special/bug18600'

[nickm at torproject.org]

commit 13eb120beaff5e006c0eb9a3fc8563c5df16a328
Merge: cb3f9bc 2c057c2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 21 10:32:39 2016 -0400

    Merge remote-tracking branch 'special/bug18600'

 src/or/rendservice.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)