Conflicts:
        src/app/config/config.c

David Goulet authored 5 years ago and Nick Mathewson committed 5 years ago

Closes #33361

Signed-off-by: David Goulet <dgoulet@torproject.org>

This should improve the usability of our configuration error messages.

Part of 33460.

Part of 33460.

Allow the "practracker" coding best practices checking script to read
unicode files, when using Python 2.

We made the script use unicode literals in 0.4.3.1-alpha, but didn't
change the codec for opening files.

Fixes bug 33374; bugfix on 0.4.3.1-alpha.

Conflicts:
	src/core/or/circuitmux_ewma.c

Conflicts:
* Keep disable module relay from maint-0.4.3
* Keep doxygen from maint-0.4.3
* Keep the ordering from bug33195_042

Conflicts:
* Keep RUST_VERSION from maint-0.4.2
* Keep the commented-out allow_failure entries from bug33195_041