Merge branch 'tor-gitlab/mr/327'

Conflicts:
  src/test/test.c

  Minor comment issue.

diff --cc src/app/config/config.c
Simple merge

diff --cc src/feature/dirclient/dir_server_st.h
Simple merge

diff --cc src/feature/dirclient/dirclient.c
Simple merge

diff --cc src/feature/nodelist/dirlist.c
Simple merge

diff --cc src/feature/nodelist/dirlist.h
Simple merge

diff --cc src/test/include.am
Simple merge

diff --cc src/test/test.c
index 40c053a660f051c989dae9bb85ad6b11ebcbd1fe,69086d0d4653e78b594a277ef5b22671029c253c..9543a243760ba5444bd2096c50c099f686be8408
--- 1/src/test/test.c
--- 2/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 */
  
  /**

diff --cc src/test/test.h
Simple merge