[tor-commits] [tor/main] Merge remote-tracking branch 'tor-gitlab/mr/474' into main

Tue Nov 2 15:29:12 UTC 2021

commit f6600377b495c276cbaf423d9c8907abd4cb3c82
Merge: b109161c8f 7084ec8710
Author: Alexander FÃ¦rÃ¸y <ahf at torproject.org>
Date:   Tue Nov 2 15:28:56 2021 +0000

    Merge remote-tracking branch 'tor-gitlab/mr/474' into main

 changes/bug40396                  | 10 ++++++++++
 changes/bug40496                  |  6 ++++++
 changes/bug40497                  |  8 ++++++++
 doc/man/tor.1.txt                 | 11 ++++++-----
 src/feature/client/bridges.c      | 22 +++++++++++++++++-----
 src/feature/client/bridges.h      |  3 ++-
 src/feature/client/entrynodes.c   | 39 +++++++++++++++++++++++++++++++++++++++
 src/feature/dirclient/dlstatus.c  | 17 ++++++++---------
 src/feature/nodelist/nodelist.c   | 10 ++++++++--
 src/feature/nodelist/routerlist.c |  9 ++++++++-
 src/test/test_dir.c               |  8 +-------
 11 files changed, 113 insertions(+), 30 deletions(-)