[tor-commits] [tor/master] Merge branch 'tor-gitlab/mr/327'

[dgoulet@xxxxxxxxxxxxxx]

commit 3bd7367274576ca1b2229561e34044f86e26d337
Merge: 973fcf056a ebb826f4a1
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date:   Fri Apr 23 12:48:55 2021 -0400

    Merge branch 'tor-gitlab/mr/327'
    
    Conflicts:
      src/test/test.c
    
      Minor comment issue.

 src/app/config/config.c               |  96 ++++++++++++++++++++-
 src/feature/dirclient/dir_server_st.h |   6 ++
 src/feature/dirclient/dirclient.c     |  38 ++++++++-
 src/feature/nodelist/dirlist.c        | 147 +++++++++++++++++++++++++++++++-
 src/feature/nodelist/dirlist.h        |  35 ++++++++
 src/test/include.am                   |   1 +
 src/test/test.c                       |   2 +-
 src/test/test.h                       |   1 +
 src/test/test_dirauth_ports.c         | 152 ++++++++++++++++++++++++++++++++++
 9 files changed, 472 insertions(+), 6 deletions(-)

diff --cc src/test/test.c
index 40c053a660,69086d0d46..9543a24376
--- a/src/test/test.c
+++ b/src/test/test.c
@@@ -1,6 -1,6 +1,5 @@@
  /* Copyright (c) 2001-2004, Roger Dingledine.
- ->a * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
 - * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
 - * Copyright (c) 2007-2020, The Tor Project, Inc. */
 + * Copyright (c) 2007-2021, The Tor Project, Inc. */
  /* See LICENSE for licensing information */
  
  /**



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