[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1719/head' into maint-0.4.3

[nickm@xxxxxxxxxxxxxx]

commit f733b8acd67f487a56e56bfb454ff99bc8d1cab0
Merge: a79841fd8 f0964628e
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Feb 20 08:48:17 2020 -0500

    Merge remote-tracking branch 'tor-github/pr/1719/head' into maint-0.4.3

 changes/ticket33029                      |   5 +
 doc/tor.1.txt                            |  10 +-
 scripts/maint/practracker/exceptions.txt |   2 +-
 src/core/mainloop/connection.c           |  56 ++++----
 src/core/mainloop/connection.h           |   4 +-
 src/feature/dirauth/dirauth_config.c     |   9 ++
 src/feature/dirauth/dirauth_config.h     |   4 +
 src/feature/dirauth/dirauth_options.inc  |   7 +
 src/feature/dircache/dircache.c          |  13 +-
 src/feature/nodelist/dirlist.c           |  31 +++++
 src/feature/nodelist/dirlist.h           |   2 +
 src/feature/nodelist/nodelist.c          |  43 ++++--
 src/feature/nodelist/nodelist.h          |   2 +
 src/test/test_address_set.c              |  15 ++-
 src/test/test_bwmgt.c                    | 217 ++++++++++++++++++++++++++++++-
 15 files changed, 371 insertions(+), 49 deletions(-)




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