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

[nickm at torproject.org]

commit 327efe9190b2aaf863cfd4a7d8aebfacc58cfd9c
Merge: 57c61f3 5fa280f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 9 12:05:14 2015 -0400

    Merge branch 'bug4862_027_04_squashed'

 changes/bug4862      |    8 +
 doc/tor.1.txt        |    4 +
 src/or/config.c      |    1 +
 src/or/directory.c   |    2 +
 src/or/or.h          |   29 +--
 src/or/rendservice.c |  612 ++++++++++++++++++++++++++------------------------
 src/or/rendservice.h |    1 +
 7 files changed, 351 insertions(+), 306 deletions(-)