[tor-commits] [tor/master] Merge remote-tracking branch 'rl1987/feature8323_squashed2'

[nickm at torproject.org]

commit 5746e210b8d0dfc54447ca31d6b2ac55a13271cc
Merge: d5e4b6983 25341245a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Jun 17 20:20:15 2018 -0400

    Merge remote-tracking branch 'rl1987/feature8323_squashed2'

 changes/feature8323        |  3 ++
 src/or/control.c           | 23 ++++++++++++++
 src/test/test_controller.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 102 insertions(+)