summaryrefslogtreecommitdiff
path: root/src/app/main
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2021-10-04 10:49:27 -0400
committerDavid Goulet <dgoulet@torproject.org>2021-10-04 10:49:27 -0400
commit1873d4c14c62e8c737e24a60b0aca5a3fcd89eb4 (patch)
tree3b663a7275af1fd441037b942b7b9e05ae8d1d9b /src/app/main
parent1a10948260d915d4982415e37dd6495bca9ef545 (diff)
parent7005046bd27968069dd56cad3fc66d644c7f517b (diff)
downloadtor-1873d4c14c62e8c737e24a60b0aca5a3fcd89eb4.tar.gz
tor-1873d4c14c62e8c737e24a60b0aca5a3fcd89eb4.zip
Merge branch 'tor-gitlab/mr/444'
Diffstat (limited to 'src/app/main')
-rw-r--r--src/app/main/main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/app/main/main.c b/src/app/main/main.c
index 0959b0db71..fe18ea0524 100644
--- a/src/app/main/main.c
+++ b/src/app/main/main.c
@@ -27,6 +27,8 @@
#include "core/or/channel.h"
#include "core/or/channelpadding.h"
#include "core/or/circuitpadding.h"
+#include "core/or/congestion_control_common.h"
+#include "core/or/congestion_control_flow.h"
#include "core/or/circuitlist.h"
#include "core/or/command.h"
#include "core/or/connection_or.h"
@@ -630,6 +632,8 @@ tor_init(int argc, char *argv[])
* until we get a consensus */
channelpadding_new_consensus_params(NULL);
circpad_new_consensus_params(NULL);
+ congestion_control_new_consensus_params(NULL);
+ flow_control_new_consensus_params(NULL);
/* Initialize circuit padding to defaults+torrc until we get a consensus */
circpad_machines_init();