Merge branch 'tor-gitlab/mr/490'

diff --cc configure.ac
Simple merge

diff --cc src/core/or/congestion_control_common.c
Simple merge

diff --cc src/core/or/congestion_control_flow.c
Simple merge

diff --cc src/core/or/congestion_control_nola.c
Simple merge

diff --cc src/core/or/congestion_control_westwood.c
Simple merge