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

[nickm at torproject.org]

commit 41efe22c030e7c896ae5e1c380a3d783c03f0861
Merge: 26e0f86 a9b9f6d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 30 13:32:52 2015 -0400

    Merge branch 'bug15814_027_04'

 src/or/circuituse.c      |    2 +-
 src/or/connection_edge.c |   37 ++++++++---------
 src/or/control.c         |   28 ++++++-------
 src/or/or.h              |   10 ++++-
 src/or/rendclient.c      |  100 ++++++++++++++++++++++++++++------------------
 src/or/rendclient.h      |    9 ++---
 src/or/rendcommon.c      |   97 ++++++++++++++++++++++++++++++++++++++++++++
 src/or/rendcommon.h      |    8 ++++
 src/or/rendservice.c     |   19 ++++-----
 9 files changed, 218 insertions(+), 92 deletions(-)