[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug18145'

[nickm at torproject.org]

commit 42dea56363c24960e85344749644f6502f625463
Merge: 0010b80 4339fa5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 26 10:01:34 2016 -0500

    Merge remote-tracking branch 'teor/bug18145'

 src/or/circuituse.c    |   28 ++++++++++++++--------------
 src/or/config.c        |    2 +-
 src/or/connection.c    |    2 +-
 src/or/connection_or.c |    4 ++--
 src/or/directory.c     |    2 +-
 src/or/entrynodes.c    |    2 +-
 src/or/ext_orport.c    |    2 +-
 src/or/or.h            |   42 ++++++++++++++++++++++++------------------
 src/or/relay.c         |    2 +-
 src/or/rendclient.c    |   15 ++++++++-------
 src/or/rendmid.c       |    9 +++++----
 src/or/rendservice.c   |    4 ++--
 src/or/router.c        |    2 +-
 src/or/transports.c    |    2 +-
 14 files changed, 63 insertions(+), 55 deletions(-)