[tor-commits] [tor/master] Merge remote-tracking branch 'mikeperry/bug25400_squashed'

[nickm at torproject.org]

commit 1ba9b7e0137afc1a4bd6da7dd986ed98999cfbe5
Merge: 0e8ae82a8 f921fd771
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Apr 22 20:39:35 2018 -0400

    Merge remote-tracking branch 'mikeperry/bug25400_squashed'

 changes/bug25400     |  5 +++++
 src/common/util.c    | 13 +++++++++++++
 src/common/util.h    |  2 ++
 src/or/command.c     | 11 +++++++++++
 src/or/connection.c  | 22 +---------------------
 src/or/control.c     |  8 --------
 src/or/relay.c       |  6 ++++++
 src/test/test_util.c | 18 ++++++++++++++++++
 8 files changed, 56 insertions(+), 29 deletions(-)