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

[nickm at torproject.org]

commit b9054c6ee45a595580f89b4afd021ce70c6fc768
Merge: 4f1a5da 3a3e88d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 11 09:21:09 2017 -0500

    Merge branch 'bug20987_squashed'

 changes/bug20987     |  3 +++
 src/or/rendservice.c | 62 ++++++++++++++++++++++++----------------------------
 2 files changed, 31 insertions(+), 34 deletions(-)