[tor-commits] [tor/master] Merge remote-tracking branch 'neel/b25511-r4'

[nickm at torproject.org]

commit cd3fc2aa4867e89877bbfb99f4f767d761b91f25
Merge: 8c01aee2e dca36eff8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 23 09:13:24 2018 -0400

    Merge remote-tracking branch 'neel/b25511-r4'

 changes/ticket25511        |  5 +++++
 src/common/compat_time.c   |  4 ++--
 src/common/compat_time.h   |  2 +-
 src/common/util.c          |  9 ++++++++
 src/common/util.h          |  1 +
 src/or/control.c           | 28 +++++++++++++++++++++++
 src/or/control.h           |  4 ++++
 src/test/test_controller.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 106 insertions(+), 3 deletions(-)