November 2017 - tor-commits - lists.torproject.org

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 06 Nov '17

06 Nov '17

commit b4bb76ee633ec0efc88e44f565398685f7b7cc89 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 6 16:46:37 2017 +0000 Update translations for tor-launcher-properties --- nl_BE/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl_BE/torlauncher.properties b/nl_BE/torlauncher.properties index e63e160a3..373249ecd 100644 --- a/nl_BE/torlauncher.properties +++ b/nl_BE/torlauncher.properties @@ -53,7 +53,7 @@ torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Connected to the Tor network! torlauncher.bootstrapWarning.done=klaar -torlauncher.bootstrapWarning.connectrefused=connection refused +torlauncher.bootstrapWarning.connectrefused=verbinding geweigerd torlauncher.bootstrapWarning.misc=miscellaneous torlauncher.bootstrapWarning.resourcelimit=insufficient resources torlauncher.bootstrapWarning.identity=identity mismatch

1 0

[tor/release-0.3.2] Fix a 32-bit formatting warning
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit bebdd910580ba13de02743ecfedb34bd2b2842a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 6 10:16:10 2017 -0500 Fix a 32-bit formatting warning --- src/or/scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/scheduler.c b/src/or/scheduler.c index 97b6d40b1..1438dc60f 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -687,7 +687,7 @@ scheduler_bug_occurred(const channel_t *chan) chan->global_identifier, channel_state_to_string(chan->state), chan->scheduler_state, circuitmux_num_cells(chan->cmux), - outbuf_len); + (unsigned long)outbuf_len); } {

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit 02a4c641da4497b77ded4123c4550a583916eff2 Merge: 306d1fb60 bebdd9105 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 6 10:16:19 2017 -0500 Merge branch 'maint-0.3.2' src/or/scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit d05780c1bb5bc171d14102cdbe7b630c65ff45e5 Merge: 8c9b5bfb8 bebdd9105 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 6 10:16:18 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/or/scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.3.2] Fix a 32-bit formatting warning
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit bebdd910580ba13de02743ecfedb34bd2b2842a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 6 10:16:10 2017 -0500 Fix a 32-bit formatting warning --- src/or/scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/scheduler.c b/src/or/scheduler.c index 97b6d40b1..1438dc60f 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -687,7 +687,7 @@ scheduler_bug_occurred(const channel_t *chan) chan->global_identifier, channel_state_to_string(chan->state), chan->scheduler_state, circuitmux_num_cells(chan->cmux), - outbuf_len); + (unsigned long)outbuf_len); } {

1 0

[tor/master] Fix a 32-bit formatting warning
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit bebdd910580ba13de02743ecfedb34bd2b2842a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 6 10:16:10 2017 -0500 Fix a 32-bit formatting warning --- src/or/scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/scheduler.c b/src/or/scheduler.c index 97b6d40b1..1438dc60f 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -687,7 +687,7 @@ scheduler_bug_occurred(const channel_t *chan) chan->global_identifier, channel_state_to_string(chan->state), chan->scheduler_state, circuitmux_num_cells(chan->cmux), - outbuf_len); + (unsigned long)outbuf_len); } {

1 0

[tor/master] Fix manual formatting
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit 3563a2c8194ebe9430603803a53b073e181ce773 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 5 12:21:28 2017 -0800 Fix manual formatting Few issues... * Malformed ReducedExitPolicy, causing brackets to appear. * ExitPolicyDefault wasn't actually listed, instead it munged the description into the ExitPolicy description. * Extra plus signs in the ExitPolicy and ReducedExitPolicy entries. After an hour of struggling with asciidoc couldn't figure out how to format it as 'paragraph => example => paragraph with same indentation' so just rearranging the ExitPolicy entry. Patches welcome if someone strongly prefers having the paragraph after the example. https://trac.torproject.org/projects/tor/ticket/24147 --- doc/tor.1.txt | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 3b881d08f..725baaa64 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1763,8 +1763,15 @@ is non-zero): write your IPv6 rules using accept6/reject6 \*6, and your IPv4 rules using accept/reject \*4. If you want to \_replace_ the default exit policy, end your exit policy with either a reject \*:* or an accept \*:*. Otherwise, - you're \_augmenting_ (prepending to) the default exit policy. The default - exit policy is: + + you're \_augmenting_ (prepending to) the default exit policy. + + + + If you want to use a reduced exit policy rather than the default exit + policy, set "ReducedExitPolicy 1". If you want to _replace_ the default + exit policy with your custom exit policy, end your exit policy with either + a reject *:* or an accept *:*. Otherwise, you’re _augmenting_ (prepending + to) the default or reduced exit policy. + + + + The default exit policy is: reject *:25 reject *:119 @@ -1776,15 +1783,9 @@ is non-zero): reject *:6346-6429 reject *:6699 reject *:6881-6999 - accept *:* + - + - If you want to use a reduced exit policy rather than the default exit - policy, set "ReducedExitPolicy 1". If you want to _replace_ the default - exit policy with your custom exit policy, end your exit policy with either - a reject *:* or an accept *:*. Otherwise, you’re _augmenting_ (prepending - to) the default or reduced exit policy. + accept *:* -[[ExitPolicyDefault]]:: +[[ExitPolicyDefault]] **ExitPolicyDefault**:: Since the default exit policy uses accept/reject *, it applies to both IPv4 and IPv6 addresses. @@ -1806,7 +1807,7 @@ is non-zero): to disclose. (Default: 0) -[[ReducedExitPolicy] **ReducedExitPolicy** **0**|**1**:: +[[ReducedExitPolicy]] **ReducedExitPolicy** **0**|**1**:: If set, use a reduced exit policy rather than the default one. + + The reduced exit policy is an alternative to the default exit policy. It @@ -1895,8 +1896,8 @@ is non-zero): accept *:19638 accept *:50002 accept *:64738 - reject *:* + - + + reject *:* + (Default: 0) [[IPv6Exit]] **IPv6Exit** **0**|**1**::

1 0

[tor/master] Merge remote-tracking branch 'atagar/manual'
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit 306d1fb60aaba4eb26be0ea467ddca078136112c Merge: 7097c4a37 3563a2c81 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 6 10:05:22 2017 -0500 Merge remote-tracking branch 'atagar/manual' doc/tor.1.txt | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)

1 0

[tor/master] test: Fix SR initialization in routerlist test
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit 198ede53147dc3a33384e836b1ad9c64e95d0232 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 1 11:39:52 2017 -0400 test: Fix SR initialization in routerlist test Fixes #24053 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_routerlist.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c index 81451a4bc..05d0820d8 100644 --- a/src/test/test_routerlist.c +++ b/src/test/test_routerlist.c @@ -454,7 +454,10 @@ test_directory_guard_fetch_with_no_dirinfo(void *arg) (void) arg; /* Initialize the SRV subsystem */ + MOCK(get_my_v3_authority_cert, get_my_v3_authority_cert_m); + mock_cert = authority_cert_parse_from_string(AUTHORITY_CERT_1, NULL); sr_init(0); + UNMOCK(get_my_v3_authority_cert); /* Initialize the entry node configuration from the ticket */ options->UseEntryGuards = 1;

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug24053_033_01'
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit 7097c4a37a914d7a64a0da3a8d1b61816dbe071b Merge: 3beb3dac2 198ede531 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 6 10:04:22 2017 -0500 Merge remote-tracking branch 'dgoulet/bug24053_033_01' src/test/test_routerlist.c | 3 +++ 1 file changed, 3 insertions(+)

1 0