commit 9190f43b1a9a6cb4eee02c6dc0a5fae17f9bfc59
Merge: e4109020e 97c9ced70
Author: Nick Mathewson <[email protected]>
Date: Fri Dec 21 11:30:58 2018 -0500
Merge branch 'maint-0.3.5'
.gitignore | 3 +++
configure.ac | 38 +++++++++++++++++++++++++++++---------
warning_flags.in | 1 +
3 files changed, 33 insertions(+), 9 deletions(-)
diff --cc configure.ac
index 7f0d37544,d992b8d01..76fc12be5
--- a/configure.ac
+++ b/configure.ac
@@@ -2426,6 -2445,8 +2445,7 @@@ AC_CONFIG_FILES(
src/config/torrc.minimal
src/rust/.cargo/config
scripts/maint/checkOptionDocs.pl
- scripts/maint/updateVersions.pl
+ warning_flags
])
if test "x$asciidoc" = "xtrue" && test "$ASCIIDOC" = "none"; then
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
