diff options
| author | George Kadianakis <desnacked@riseup.net> | 2021-03-17 13:43:47 +0200 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2021-03-17 13:43:47 +0200 |
| commit | ea781dc44fe9423af4197cfc1e07825d4366e491 (patch) | |
| tree | e51025e4072730f3dbc6da45662bff4bd220d4a4 /src/core/or/circuitlist.h | |
| parent | aa49562a0520ff3ddbbce9fc5e77acd8dd4a5812 (diff) | |
| parent | 59bbf8cde9144ee5c8d060959e723a4bedfd6bb8 (diff) | |
| download | tor-ea781dc44fe9423af4197cfc1e07825d4366e491.tar.gz tor-ea781dc44fe9423af4197cfc1e07825d4366e491.zip | |
Merge branch 'maint-0.4.5' into release-0.4.5
Diffstat (limited to 'src/core/or/circuitlist.h')
| -rw-r--r-- | src/core/or/circuitlist.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/or/circuitlist.h b/src/core/or/circuitlist.h index 3178e6cd0d..bd4a117e26 100644 --- a/src/core/or/circuitlist.h +++ b/src/core/or/circuitlist.h @@ -118,7 +118,8 @@ * bandwidth measurement, reachability test and address discovery from an * authority using the NETINFO cell. */ #define CIRCUIT_PURPOSE_TESTING 21 -/** A controller made this circuit and Tor should not use it. */ +/** A controller made this circuit and Tor should not cannibalize it or attach + * streams to it without explicitly being told. */ #define CIRCUIT_PURPOSE_CONTROLLER 22 /** This circuit is used for path bias probing only */ #define CIRCUIT_PURPOSE_PATH_BIAS_TESTING 23 |