[tor-commits] [tor/master] Merge branch 'bug21599_squashed'

[nickm at torproject.org]

commit 958ec0f5f877b84d8519102cc0b5b55583a15144
Merge: fe17955 684778e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Mar 4 23:16:29 2017 -0500

    Merge branch 'bug21599_squashed'

 changes/bug21599     | 4 ++++
 src/or/rendservice.c | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)