April 2018 - tor-commits - lists.torproject.org

[tor/master] Basic unit tests for relay_crypto.c
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit 7db4d0c55f1e0146ecd0207f788075b672411cc2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 17 11:23:05 2018 -0400 Basic unit tests for relay_crypto.c These tests handle incoming and outgoing cells on a three-hop circuit, and make sure that the crypto works end-to-end. They don't yet test spec conformance, leaky-pipe, or various error cases. --- src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_relaycrypt.c | 184 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 187 insertions(+) diff --git a/src/test/include.am b/src/test/include.am index 1a49367c6..0c74460dc 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -150,6 +150,7 @@ src_test_test_SOURCES = \ src/test/test_pubsub.c \ src/test/test_relay.c \ src/test/test_relaycell.c \ + src/test/test_relaycrypt.c \ src/test/test_rendcache.c \ src/test/test_replay.c \ src/test/test_router.c \ diff --git a/src/test/test.c b/src/test/test.c index 2712de4ed..655fd9898 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1242,6 +1242,7 @@ struct testgroup_t testgroups[] = { { "pt/", pt_tests }, { "relay/" , relay_tests }, { "relaycell/", relaycell_tests }, + { "relaycrypt/", relaycrypt_tests }, { "rend_cache/", rend_cache_tests }, { "replaycache/", replaycache_tests }, { "router/", router_tests }, diff --git a/src/test/test.h b/src/test/test.h index 26139fc5f..72f806362 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -237,6 +237,7 @@ extern struct testcase_t pubsub_tests[]; extern struct testcase_t pt_tests[]; extern struct testcase_t relay_tests[]; extern struct testcase_t relaycell_tests[]; +extern struct testcase_t relaycrypt_tests[]; extern struct testcase_t rend_cache_tests[]; extern struct testcase_t replaycache_tests[]; extern struct testcase_t router_tests[]; diff --git a/src/test/test_relaycrypt.c b/src/test/test_relaycrypt.c new file mode 100644 index 000000000..eba989718 --- /dev/null +++ b/src/test/test_relaycrypt.c @@ -0,0 +1,184 @@ +/* Copyright 2001-2004 Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "or.h" +#include "circuitbuild.h" +#define CIRCUITLIST_PRIVATE +#include "circuitlist.h" +#include "relay.h" +#include "relay_crypto.h" +#include "test.h" + +static const char KEY_MATERIAL[3][CPATH_KEY_MATERIAL_LEN] = { + " 'My public key is in this signed x509 object', said Tom assertively.", + "'Let's chart the pedal phlanges in the tomb', said Tom cryptographically", + " 'Segmentation fault bugs don't _just happen_', said Tom seethingly.", +}; + +typedef struct testing_circuitset_t { + or_circuit_t *or_circ[3]; + origin_circuit_t *origin_circ; +} testing_circuitset_t; + +static int testing_circuitset_teardown(const struct testcase_t *testcase, + void *ptr); + +static void * +testing_circuitset_setup(const struct testcase_t *testcase) +{ + testing_circuitset_t *cs = tor_malloc_zero(sizeof(testing_circuitset_t)); + int i; + + for (i=0; i<3; ++i) { + cs->or_circ[i] = or_circuit_new(0, NULL); + tt_int_op(0, OP_EQ, + relay_crypto_init(&cs->or_circ[i]->crypto, + KEY_MATERIAL[i], sizeof(KEY_MATERIAL[i]), + 0, 0)); + } + + cs->origin_circ = origin_circuit_new(); + cs->origin_circ->base_.purpose = CIRCUIT_PURPOSE_C_GENERAL; + for (i=0; i<3; ++i) { + crypt_path_t *hop = tor_malloc_zero(sizeof(*hop)); + relay_crypto_init(&hop->crypto, KEY_MATERIAL[i], sizeof(KEY_MATERIAL[i]), + 0, 0); + hop->state = CPATH_STATE_OPEN; + onion_append_to_cpath(&cs->origin_circ->cpath, hop); + tt_ptr_op(hop, OP_EQ, cs->origin_circ->cpath->prev); + } + + return cs; + done: + testing_circuitset_teardown(testcase, cs); + return NULL; +} + +static int +testing_circuitset_teardown(const struct testcase_t *testcase, void *ptr) +{ + (void)testcase; + testing_circuitset_t *cs = ptr; + int i; + for (i=0; i<3; ++i) { + circuit_free_(TO_CIRCUIT(cs->or_circ[i])); + } + circuit_free_(TO_CIRCUIT(cs->origin_circ)); + tor_free(cs); + return 1; +} + +static const struct testcase_setup_t relaycrypt_setup = { + testing_circuitset_setup, testing_circuitset_teardown +}; + +/* Test encrypting a cell to the final hop on a circuit, decrypting it + * at each hop, and recognizing it at the other end. Then do it again + * and again as the state evolves. */ +static void +test_relaycrypt_outbound(void *arg) +{ + testing_circuitset_t *cs = arg; + tt_assert(cs); + + relay_header_t rh; + cell_t orig; + cell_t encrypted; + int i, j; + + for (i = 0; i < 50; ++i) { + crypto_rand((char *)&orig, sizeof(orig)); + + relay_header_unpack(&rh, orig.payload); + rh.recognized = 0; + memset(rh.integrity, 0, sizeof(rh.integrity)); + relay_header_pack(orig.payload, &rh); + + memcpy(&encrypted, &orig, sizeof(orig)); + + /* Encrypt the cell to the last hop */ + relay_encrypt_cell_outbound(&encrypted, cs->origin_circ, + cs->origin_circ->cpath->prev); + + for (j = 0; j < 3; ++j) { + crypt_path_t *layer_hint = NULL; + char recognized = 0; + int r = relay_decrypt_cell(TO_CIRCUIT(cs->or_circ[j]), + &encrypted, + CELL_DIRECTION_OUT, + &layer_hint, &recognized); + tt_int_op(r, OP_EQ, 0); + tt_ptr_op(layer_hint, OP_EQ, NULL); + tt_int_op(recognized != 0, OP_EQ, j == 2); + } + + tt_mem_op(orig.payload, OP_EQ, encrypted.payload, CELL_PAYLOAD_SIZE); + } + + done: + ; +} + +/* As above, but simulate inbound cells from the last hop. */ +static void +test_relaycrypt_inbound(void *arg) +{ + testing_circuitset_t *cs = arg; + tt_assert(cs); + + relay_header_t rh; + cell_t orig; + cell_t encrypted; + int i, j; + + for (i = 0; i < 50; ++i) { + crypto_rand((char *)&orig, sizeof(orig)); + + relay_header_unpack(&rh, orig.payload); + rh.recognized = 0; + memset(rh.integrity, 0, sizeof(rh.integrity)); + relay_header_pack(orig.payload, &rh); + + memcpy(&encrypted, &orig, sizeof(orig)); + + /* Encrypt the cell to the last hop */ + relay_encrypt_cell_inbound(&encrypted, cs->or_circ[2]); + + crypt_path_t *layer_hint = NULL; + char recognized = 0; + int r; + for (j = 1; j >= 0; --j) { + r = relay_decrypt_cell(TO_CIRCUIT(cs->or_circ[j]), + &encrypted, + CELL_DIRECTION_IN, + &layer_hint, &recognized); + tt_int_op(r, OP_EQ, 0); + tt_ptr_op(layer_hint, OP_EQ, NULL); + tt_int_op(recognized, OP_EQ, 0); + } + + relay_decrypt_cell(TO_CIRCUIT(cs->origin_circ), + &encrypted, + CELL_DIRECTION_IN, + &layer_hint, &recognized); + tt_int_op(r, OP_EQ, 0); + tt_int_op(recognized, OP_EQ, 1); + tt_ptr_op(layer_hint, OP_EQ, cs->origin_circ->cpath->prev); + + tt_mem_op(orig.payload, OP_EQ, encrypted.payload, CELL_PAYLOAD_SIZE); + } + done: + ; +} + +#define TEST(name) \ + { # name, test_relaycrypt_ ## name, 0, &relaycrypt_setup, NULL } + +struct testcase_t relaycrypt_tests[] = { + TEST(outbound), + TEST(inbound), + END_OF_TESTCASES +}; +

1 0

[tor/maint-0.3.2] PerConnBW{Rate, Burst} docs: do not say consensus param is always set
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit c2d93e8a7d1d2d4e7f3516681e2ee62ce4f87285 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 19 06:14:57 2018 -0400 PerConnBW{Rate,Burst} docs: do not say consensus param is always set Closes ticket 25296; bugfix on 0.2.2.7-alpha when these manpage entries were introduced. --- changes/bug25296_032 | 5 +++++ doc/tor.1.txt | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/changes/bug25296_032 b/changes/bug25296_032 new file mode 100644 index 000000000..f60048ca6 --- /dev/null +++ b/changes/bug25296_032 @@ -0,0 +1,5 @@ + o Minor bugfixes (documentation): + - Document that the PerConnBW{Rate,Burst} options will fall back to their + corresponding consensus parameters only if those parameters are + set. Previously we had claimed that these values would always be + set in the consensus. Fixes bug 25296; bugfix on 0.2.2.7-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index aad8440a2..d7884968e 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -239,14 +239,14 @@ GENERAL OPTIONS (Default: 0) [[PerConnBWRate]] **PerConnBWRate** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: - If set, do separate rate limiting for each connection from a non-relay. - You should never need to change this value, since a network-wide value is - published in the consensus and your relay will use that value. (Default: 0) + If this option is set manually, or via the "perconnbwrate" consensus + field, Tor will use it for separate rate limiting for each connection + from a non-relay. (Default: 0) [[PerConnBWBurst]] **PerConnBWBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: - If set, do separate rate limiting for each connection from a non-relay. - You should never need to change this value, since a network-wide value is - published in the consensus and your relay will use that value. (Default: 0) + If this option is set manually, or via the "perconnbwburst" consensus + field, Tor will use it for separate rate limiting for each connection + from a non-relay. (Default: 0) [[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ socks4|socks5 __IP__:__PORT__:: **ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]::

1 0

[tor/maint-0.3.3] Merge branch 'ticket25296_032_squashed' into maint-0.3.2
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit 124e06e85cf72152e9bdbd91e3cd6da9a5b1fd39 Merge: df519e5de c2d93e8a7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 5 12:08:53 2018 -0400 Merge branch 'ticket25296_032_squashed' into maint-0.3.2 changes/bug25296_032 | 5 +++++ doc/tor.1.txt | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.3.2] Merge branch 'ticket25296_032_squashed' into maint-0.3.2
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit 124e06e85cf72152e9bdbd91e3cd6da9a5b1fd39 Merge: df519e5de c2d93e8a7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 5 12:08:53 2018 -0400 Merge branch 'ticket25296_032_squashed' into maint-0.3.2 changes/bug25296_032 | 5 +++++ doc/tor.1.txt | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-)

1 0

[tor/master] PerConnBW{Rate, Burst} docs: do not say consensus param is always set
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit c2d93e8a7d1d2d4e7f3516681e2ee62ce4f87285 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 19 06:14:57 2018 -0400 PerConnBW{Rate,Burst} docs: do not say consensus param is always set Closes ticket 25296; bugfix on 0.2.2.7-alpha when these manpage entries were introduced. --- changes/bug25296_032 | 5 +++++ doc/tor.1.txt | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/changes/bug25296_032 b/changes/bug25296_032 new file mode 100644 index 000000000..f60048ca6 --- /dev/null +++ b/changes/bug25296_032 @@ -0,0 +1,5 @@ + o Minor bugfixes (documentation): + - Document that the PerConnBW{Rate,Burst} options will fall back to their + corresponding consensus parameters only if those parameters are + set. Previously we had claimed that these values would always be + set in the consensus. Fixes bug 25296; bugfix on 0.2.2.7-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index aad8440a2..d7884968e 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -239,14 +239,14 @@ GENERAL OPTIONS (Default: 0) [[PerConnBWRate]] **PerConnBWRate** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: - If set, do separate rate limiting for each connection from a non-relay. - You should never need to change this value, since a network-wide value is - published in the consensus and your relay will use that value. (Default: 0) + If this option is set manually, or via the "perconnbwrate" consensus + field, Tor will use it for separate rate limiting for each connection + from a non-relay. (Default: 0) [[PerConnBWBurst]] **PerConnBWBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: - If set, do separate rate limiting for each connection from a non-relay. - You should never need to change this value, since a network-wide value is - published in the consensus and your relay will use that value. (Default: 0) + If this option is set manually, or via the "perconnbwburst" consensus + field, Tor will use it for separate rate limiting for each connection + from a non-relay. (Default: 0) [[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ socks4|socks5 __IP__:__PORT__:: **ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]::

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit 12fc4206f28576d872033b8a99756252e5354662 Merge: 2dee38fba 124e06e85 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 5 12:09:00 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25296_032 | 5 +++++ doc/tor.1.txt | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --cc doc/tor.1.txt index 415cd6f3a,d7884968e..af2ac090c --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@@ -238,18 -236,17 +238,18 @@@ GENERAL OPTION [[RelayBandwidthBurst]] **RelayBandwidthBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: If not 0, limit the maximum token bucket size (also known as the burst) for \_relayed traffic_ to the given number of bytes in each direction. - (Default: 0) + They do not include directory fetches by the relay (from authority + or other relays), because that is considered "client" activity. (Default: 0) [[PerConnBWRate]] **PerConnBWRate** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: - If set, do separate rate limiting for each connection from a non-relay. - You should never need to change this value, since a network-wide value is - published in the consensus and your relay will use that value. (Default: 0) + If this option is set manually, or via the "perconnbwrate" consensus + field, Tor will use it for separate rate limiting for each connection + from a non-relay. (Default: 0) [[PerConnBWBurst]] **PerConnBWBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: - If set, do separate rate limiting for each connection from a non-relay. - You should never need to change this value, since a network-wide value is - published in the consensus and your relay will use that value. (Default: 0) + If this option is set manually, or via the "perconnbwburst" consensus + field, Tor will use it for separate rate limiting for each connection + from a non-relay. (Default: 0) [[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ socks4|socks5 __IP__:__PORT__:: **ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]::

1 0

[tor/maint-0.3.3] PerConnBW{Rate, Burst} docs: do not say consensus param is always set
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit c2d93e8a7d1d2d4e7f3516681e2ee62ce4f87285 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 19 06:14:57 2018 -0400 PerConnBW{Rate,Burst} docs: do not say consensus param is always set Closes ticket 25296; bugfix on 0.2.2.7-alpha when these manpage entries were introduced. --- changes/bug25296_032 | 5 +++++ doc/tor.1.txt | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/changes/bug25296_032 b/changes/bug25296_032 new file mode 100644 index 000000000..f60048ca6 --- /dev/null +++ b/changes/bug25296_032 @@ -0,0 +1,5 @@ + o Minor bugfixes (documentation): + - Document that the PerConnBW{Rate,Burst} options will fall back to their + corresponding consensus parameters only if those parameters are + set. Previously we had claimed that these values would always be + set in the consensus. Fixes bug 25296; bugfix on 0.2.2.7-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index aad8440a2..d7884968e 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -239,14 +239,14 @@ GENERAL OPTIONS (Default: 0) [[PerConnBWRate]] **PerConnBWRate** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: - If set, do separate rate limiting for each connection from a non-relay. - You should never need to change this value, since a network-wide value is - published in the consensus and your relay will use that value. (Default: 0) + If this option is set manually, or via the "perconnbwrate" consensus + field, Tor will use it for separate rate limiting for each connection + from a non-relay. (Default: 0) [[PerConnBWBurst]] **PerConnBWBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: - If set, do separate rate limiting for each connection from a non-relay. - You should never need to change this value, since a network-wide value is - published in the consensus and your relay will use that value. (Default: 0) + If this option is set manually, or via the "perconnbwburst" consensus + field, Tor will use it for separate rate limiting for each connection + from a non-relay. (Default: 0) [[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ socks4|socks5 __IP__:__PORT__:: **ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]::

1 0

[tor/master] Merge branch 'ticket25296_032_squashed' into maint-0.3.2
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit 124e06e85cf72152e9bdbd91e3cd6da9a5b1fd39 Merge: df519e5de c2d93e8a7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 5 12:08:53 2018 -0400 Merge branch 'ticket25296_032_squashed' into maint-0.3.2 changes/bug25296_032 | 5 +++++ doc/tor.1.txt | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-)

1 0

[tor/release-0.3.2] PerConnBW{Rate, Burst} docs: do not say consensus param is always set
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit c2d93e8a7d1d2d4e7f3516681e2ee62ce4f87285 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 19 06:14:57 2018 -0400 PerConnBW{Rate,Burst} docs: do not say consensus param is always set Closes ticket 25296; bugfix on 0.2.2.7-alpha when these manpage entries were introduced. --- changes/bug25296_032 | 5 +++++ doc/tor.1.txt | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/changes/bug25296_032 b/changes/bug25296_032 new file mode 100644 index 000000000..f60048ca6 --- /dev/null +++ b/changes/bug25296_032 @@ -0,0 +1,5 @@ + o Minor bugfixes (documentation): + - Document that the PerConnBW{Rate,Burst} options will fall back to their + corresponding consensus parameters only if those parameters are + set. Previously we had claimed that these values would always be + set in the consensus. Fixes bug 25296; bugfix on 0.2.2.7-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index aad8440a2..d7884968e 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -239,14 +239,14 @@ GENERAL OPTIONS (Default: 0) [[PerConnBWRate]] **PerConnBWRate** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: - If set, do separate rate limiting for each connection from a non-relay. - You should never need to change this value, since a network-wide value is - published in the consensus and your relay will use that value. (Default: 0) + If this option is set manually, or via the "perconnbwrate" consensus + field, Tor will use it for separate rate limiting for each connection + from a non-relay. (Default: 0) [[PerConnBWBurst]] **PerConnBWBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: - If set, do separate rate limiting for each connection from a non-relay. - You should never need to change this value, since a network-wide value is - published in the consensus and your relay will use that value. (Default: 0) + If this option is set manually, or via the "perconnbwburst" consensus + field, Tor will use it for separate rate limiting for each connection + from a non-relay. (Default: 0) [[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ socks4|socks5 __IP__:__PORT__:: **ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]::

1 0

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit 12fc4206f28576d872033b8a99756252e5354662 Merge: 2dee38fba 124e06e85 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 5 12:09:00 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25296_032 | 5 +++++ doc/tor.1.txt | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --cc doc/tor.1.txt index 415cd6f3a,d7884968e..af2ac090c --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@@ -238,18 -236,17 +238,18 @@@ GENERAL OPTION [[RelayBandwidthBurst]] **RelayBandwidthBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: If not 0, limit the maximum token bucket size (also known as the burst) for \_relayed traffic_ to the given number of bytes in each direction. - (Default: 0) + They do not include directory fetches by the relay (from authority + or other relays), because that is considered "client" activity. (Default: 0) [[PerConnBWRate]] **PerConnBWRate** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: - If set, do separate rate limiting for each connection from a non-relay. - You should never need to change this value, since a network-wide value is - published in the consensus and your relay will use that value. (Default: 0) + If this option is set manually, or via the "perconnbwrate" consensus + field, Tor will use it for separate rate limiting for each connection + from a non-relay. (Default: 0) [[PerConnBWBurst]] **PerConnBWBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: - If set, do separate rate limiting for each connection from a non-relay. - You should never need to change this value, since a network-wide value is - published in the consensus and your relay will use that value. (Default: 0) + If this option is set manually, or via the "perconnbwburst" consensus + field, Tor will use it for separate rate limiting for each connection + from a non-relay. (Default: 0) [[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ socks4|socks5 __IP__:__PORT__:: **ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]::

1 0