[tor-commits] [tor/master] Merge remote-tracking branch 'yawning/bug16052a_027'

[nickm at torproject.org]

commit eb7f4d0059d447f79362be22c9c0c3c66ec85857
Merge: b668d30 712bf06
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 21 10:48:52 2015 -0400

    Merge remote-tracking branch 'yawning/bug16052a_027'

 changes/feature16052     |    5 +++
 doc/tor.1.txt            |   10 ++++++
 src/or/circuituse.c      |   27 +++++++++++-----
 src/or/config.c          |    2 ++
 src/or/connection_edge.c |    2 ++
 src/or/control.c         |   21 +++++++++++-
 src/or/or.h              |    3 ++
 src/or/rendservice.c     |   79 +++++++++++++++++++++++++++++++++++++++++++++-
 src/or/rendservice.h     |    2 ++
 9 files changed, 141 insertions(+), 10 deletions(-)