[tor-commits] [tor/master] Merge remote-tracking branch 'valentecaio/t-24714'

[nickm at torproject.org]

commit 3d7bf98d13ffc090e5ba1b918f53668018690dce
Merge: 3c8a48159 7884ce76e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 15 20:19:53 2018 -0500

    Merge remote-tracking branch 'valentecaio/t-24714'

 changes/ticket24714      |  6 ++++++
 src/or/circuituse.c      |  2 +-
 src/or/connection.c      | 14 +++++++-------
 src/or/connection_edge.c |  6 +++---
 src/or/directory.c       |  2 +-
 src/or/hs_client.c       |  4 ++--
 src/or/main.c            | 18 ++++++++++--------
 src/or/or.h              |  8 ++++----
 src/or/relay.c           |  2 +-
 src/or/rendclient.c      |  4 ++--
 10 files changed, 37 insertions(+), 29 deletions(-)