Merge 8427400 into d86896b

torproject · May 16, 2019 · b0637ac · b0637ac
2 parents d86896b + 8427400
commit b0637ac
Show file tree

Hide file tree

Showing 9 changed files with 861 additions and 95 deletions.
diff --git a/changes/ticket28634 b/changes/ticket28634
@@ -0,0 +1,10 @@
+  o Major features (Circuit padding):
+    - Onion service clients will now add padding cells to the initial portions
+      of their INTRODUCE and RENDEZVOUS circuits, to make those circuits'
+      traffic patterns look more like general purpose Exit traffic. The
+      overhead for this is 2 extra cells in each direction for RENDEZVOUS
+      circuits, and 1 extra upstream cell and 10 downstream cells for INTRODUCE
+      circuits. This will only be enabled if the circuit's middle node supports
+      this feature, too. (Clients may specify fixed middle nodes with the MiddleNodes
+      torrc directive, and may force-disable this feature with the CircuitPadding
+      torrc directive). Closes ticket 28634.
diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt
@@ -290,3 +290,5 @@ problem function-size /src/tools/tor-resolve.c:build_socks5_resolve_request() 10
 problem function-size /src/tools/tor-resolve.c:do_resolve() 175
 problem function-size /src/tools/tor-resolve.c:main() 112
 problem function-size /src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 107
+problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_relay_hide_intro_circuits() 104
+problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_client_hide_rend_circuits() 112
diff --git a/src/app/main/shutdown.c b/src/app/main/shutdown.c
@@ -139,6 +139,7 @@ tor_free_all(int postfork)
   dos_free_all();
   circuitmux_ewma_free_all();
   accounting_free_all();
+  circpad_free_all();
 
   if (!postfork) {
     config_free_all();

diff --git a/src/core/include.am b/src/core/include.am
@@ -37,6 +37,7 @@ LIBTOR_APP_A_SOURCES = 				\
 	src/core/or/circuitmux.c		\
 	src/core/or/circuitmux_ewma.c		\
 	src/core/or/circuitpadding.c		\
+	src/core/or/circuitpadding_machines.c		\
 	src/core/or/circuitstats.c		\
 	src/core/or/circuituse.c		\
 	src/core/or/crypt_path.c		\
@@ -247,6 +248,7 @@ noinst_HEADERS +=					\
 	src/core/or/circuitmux_ewma.h			\
 	src/core/or/circuitstats.h			\
 	src/core/or/circuitpadding.h			\
+	src/core/or/circuitpadding_machines.h			\
 	src/core/or/circuituse.h			\
 	src/core/or/command.h				\
 	src/core/or/connection_edge.h			\