[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug20484_029_v2' into maint-0.2.9

[nickm at torproject.org]

commit c2fc0941a53884c63c477f68c74a26627bb35db8
Merge: e482541 a77187a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 7 16:12:13 2016 -0500

    Merge remote-tracking branch 'teor/bug20484_029_v2' into maint-0.2.9

 changes/bug20484          |  5 ++++
 changes/bug20529          |  4 +++
 doc/tor.1.txt             |  4 +++
 src/common/util.c         | 12 ++++----
 src/or/rendservice.c      | 75 ++++++++++++++++++++++++++++++++---------------
 src/test/test.h           |  1 +
 src/test/test_hs.c        | 55 +++++++++++++++++++---------------
 src/test/testing_common.c | 34 ++++++++++++++++++---
 8 files changed, 135 insertions(+), 55 deletions(-)