[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1718/head' into maint-0.4.2
commit b504942331dabe1beb1ddb24a3aea75a565573e2
Merge: f021389e9 7b4d9fabe
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Fri Mar 13 16:42:47 2020 -0400
Merge remote-tracking branch 'tor-github/pr/1718/head' into maint-0.4.2
changes/ticket33029 | 5 +
doc/tor.1.txt | 7 ++
src/app/config/config.c | 1 +
src/app/config/or_options_st.h | 7 ++
src/core/mainloop/connection.c | 55 +++++------
src/core/mainloop/connection.h | 5 +-
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 | 209 +++++++++++++++++++++++++++++++++++++++-
13 files changed, 348 insertions(+), 47 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits