GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still and

Commit 2e38dcb3 authored by Georg Koppen's avatar Georg Koppen

Merge branch 'maint-1.1' into master

parents 8b6b3631 4b29a493
Pipeline #952 passed with stage
in 34 minutes and 15 seconds
......@@ -30,7 +30,7 @@ circuit_timeout = 10
# address changes. If it changes, we only consider results for the relay that
# we obtained while the relay was located at its most recent IP address.
# This is NOT implemented for IPv6.
reset_bw_ipv4_changes = on
reset_bw_ipv4_changes = off
reset_bw_ipv6_changes = off
......@@ -123,4 +123,3 @@ to_stdout_format = ${format}
to_syslog_format = %(module)s[%(process)s]: <%(levelname)s> %(message)s
# verbose formatter useful for debugging
to_file_format = %(asctime)s %(levelname)s %(threadName)s %(filename)s:%(lineno)s - %(funcName)s - %(message)s
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment