[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug21596_030'

[nickm at torproject.org]

commit fe17955661551f869ea2777297bc44e08d01ec92
Merge: 3a1cba7 e0486c9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Mar 4 23:10:40 2017 -0500

    Merge remote-tracking branch 'teor/bug21596_030'

 changes/bug21596     |  5 +++++
 src/or/rendservice.c | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)