[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1358'

[nickm@xxxxxxxxxxxxxx]

commit 5fd137c482919d906f1011a8ebbff6aa0f454b5d
Merge: de7fcae72 3d17fafa0
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Oct 3 09:11:49 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1358'

 changes/ticket31840                      |  3 ++
 scripts/maint/practracker/exceptions.txt |  2 +-
 src/feature/control/control.c            | 79 ++++++++++++++++++++++----------
 3 files changed, 59 insertions(+), 25 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits