February 2020 - tor-commits - lists.torproject.org

[tor/master] hs-v3: Remove BUG() that can occur normally
by asn＠torproject.org 11 Feb '20

11 Feb '20

commit 40a321659a6537131566442ab3c2afd6f58019c9 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 4 10:13:10 2020 -0500 hs-v3: Remove BUG() that can occur normally Fixes #28992 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket28992 | 3 +++ src/feature/hs/hs_client.c | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/changes/ticket28992 b/changes/ticket28992 new file mode 100644 index 000000000..3e45d73e4 --- /dev/null +++ b/changes/ticket28992 @@ -0,0 +1,3 @@ + o Minor bugfixes (onion service v3, client): + - Remove a BUG() that is causing a stacktrace for a situation that very + rarely happens but still can. Fixes bug 28992; bugfix on 0.3.2.1-alpha. diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index fd2d26645..b045e1899 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -596,9 +596,14 @@ send_introduce1(origin_circuit_t *intro_circ, /* We need to find which intro point in the descriptor we are connected to * on intro_circ. */ ip = find_desc_intro_point_by_ident(intro_circ->hs_ident, desc); - if (BUG(ip == NULL)) { - /* If we can find a descriptor from this introduction circuit ident, we - * must have a valid intro point object. Permanent error. */ + if (ip == NULL) { + /* The following is possible if the descriptor was changed while we had + * this introduction circuit open and waiting for the rendezvous circuit to + * be ready. Which results in this situation where we can't find the + * corresponding intro point within the descriptor of the service. */ + log_info(LD_REND, "Unable to find introduction point for service %s " + "while trying to send an INTRODUCE1 cell.", + safe_str_client(onion_address)); goto perm_err; }

1 0

[tor/master] Update scripts/git/*.sh to know about 043 and not about 040.
by dgoulet＠torproject.org 11 Feb '20

11 Feb '20

commit 7404b6fb716424a7f63aa65be7ae0892a735251e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 19:56:32 2020 -0500 Update scripts/git/*.sh to know about 043 and not about 040. --- scripts/git/git-merge-forward.sh | 28 ++++++++++++++-------------- scripts/git/git-pull-all.sh | 14 +++++++------- scripts/git/git-push-all.sh | 10 +++++----- scripts/git/git-setup-dirs.sh | 14 +++++++------- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh index bbc5047cb..247c60543 100755 --- a/scripts/git/git-merge-forward.sh +++ b/scripts/git/git-merge-forward.sh @@ -94,19 +94,19 @@ TOR_WKT_NAME=${TOR_WKT_NAME:-"tor-wkt"} MAINT_035_TB=( "maint-0.3.5" "" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" \ "_035" "") # Used in maint/release merge and test branch modes -MAINT_040=( "maint-0.4.0" "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.0" \ - "_040" "_035") -MAINT_041=( "maint-0.4.1" "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" \ - "_041" "_040") +MAINT_041=( "maint-0.4.1" "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" \ + "_041" "_035") MAINT_042=( "maint-0.4.2" "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.2" \ "_042" "_041") -MAINT_MASTER=( "master" "maint-0.4.2" "$GIT_PATH/$TOR_MASTER_NAME" \ - "_master" "_042") +MAINT_043=( "maint-0.4.3" "maint-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.3" \ + "_043" "_042") +MAINT_MASTER=( "master" "maint-0.4.3" "$GIT_PATH/$TOR_MASTER_NAME" \ + "_master" "_043") RELEASE_035=( "release-0.3.5" "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" ) -RELEASE_040=( "release-0.4.0" "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.0" ) RELEASE_041=( "release-0.4.1" "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.1" ) RELEASE_042=( "release-0.4.2" "maint-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.2" ) +RELEASE_043=( "release-0.4.3" "maint-0.4.3" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.3" ) # The master branch path has to be the main repository thus contains the # origin that will be used to fetch the updates. All the worktrees are created @@ -116,14 +116,14 @@ ORIGIN_PATH="$GIT_PATH/$TOR_MASTER_NAME" # SC2034 -- shellcheck thinks that these are unused. We know better. ACTUALLY_THESE_ARE_USED=<<EOF ${MAINT_035_TB[0]} -${MAINT_040[0]} ${MAINT_041[0]} ${MAINT_042[0]} +${MAINT_043[0]} ${MAINT_MASTER[0]} ${RELEASE_035[0]} -${RELEASE_040[0]} ${RELEASE_041[0]} ${RELEASE_042[0]} +${RELEASE_043[0]} EOF ####################### @@ -181,15 +181,15 @@ if [ -z "$TEST_BRANCH_PREFIX" ]; then # maint branch RELEASE_035[@] - MAINT_040[@] - RELEASE_040[@] - MAINT_041[@] RELEASE_041[@] MAINT_042[@] RELEASE_042[@] + MAINT_043[@] + RELEASE_043[@] + MAINT_MASTER[@] ) @@ -203,12 +203,12 @@ else # We want a test branch based on the earliest maint branch MAINT_035_TB[@] - MAINT_040[@] - MAINT_041[@] MAINT_042[@] + MAINT_043[@] + MAINT_MASTER[@] ) diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh index c8d115da0..eb3e1c888 100755 --- a/scripts/git/git-pull-all.sh +++ b/scripts/git/git-pull-all.sh @@ -59,15 +59,15 @@ TOR_WKT_NAME=${TOR_WKT_NAME:-"tor-wkt"} # First set of arrays are the maint-* branch and then the release-* branch. # New arrays need to be in the WORKTREE= array else they aren't considered. MAINT_035=( "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" ) -MAINT_040=( "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.0" ) MAINT_041=( "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" ) MAINT_042=( "maint-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.2" ) +MAINT_043=( "maint-0.4.3" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.3" ) MAINT_MASTER=( "master" "$GIT_PATH/$TOR_MASTER_NAME" ) RELEASE_035=( "release-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" ) -RELEASE_040=( "release-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.0" ) RELEASE_041=( "release-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.1" ) RELEASE_042=( "release-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.2" ) +RELEASE_043=( "release-0.4.3" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.3" ) # The master branch path has to be the main repository thus contains the # origin that will be used to fetch the updates. All the worktrees are created @@ -77,14 +77,14 @@ ORIGIN_PATH="$GIT_PATH/$TOR_MASTER_NAME" # SC2034 -- shellcheck thinks that these are unused. We know better. ACTUALLY_THESE_ARE_USED=<<EOF ${MAINT_035[0]} -${MAINT_040[0]} ${MAINT_041[0]} ${MAINT_042[0]} +${MAINT_043[0]} ${MAINT_MASTER[0]} ${RELEASE_035[0]} -${RELEASE_040[0]} ${RELEASE_041[0]} ${RELEASE_042[0]} +${RELEASE_043[0]} EOF ########################### @@ -96,15 +96,15 @@ WORKTREE=( MAINT_035[@] RELEASE_035[@] - MAINT_040[@] - RELEASE_040[@] - MAINT_041[@] RELEASE_041[@] MAINT_042[@] RELEASE_042[@] + MAINT_043[@] + RELEASE_043[@] + MAINT_MASTER[@] ) COUNT=${#WORKTREE[@]} diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index 0abddc802..cb7bb5269 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -172,18 +172,18 @@ DEFAULT_UPSTREAM_BRANCHES= if [ "$DEFAULT_UPSTREAM_REMOTE" != "$UPSTREAM_REMOTE" ]; then DEFAULT_UPSTREAM_BRANCHES=$(echo \ "$DEFAULT_UPSTREAM_REMOTE"/master \ + "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.4.3 \ "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.4.2 \ "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.4.1 \ - "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.4.0 \ "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.3.5 \ ) fi UPSTREAM_BRANCHES=$(echo \ "$UPSTREAM_REMOTE"/master \ + "$UPSTREAM_REMOTE"/{release,maint}-0.4.3 \ "$UPSTREAM_REMOTE"/{release,maint}-0.4.2 \ "$UPSTREAM_REMOTE"/{release,maint}-0.4.1 \ - "$UPSTREAM_REMOTE"/{release,maint}-0.4.0 \ "$UPSTREAM_REMOTE"/{release,maint}-0.3.5 \ ) @@ -193,9 +193,9 @@ UPSTREAM_BRANCHES=$(echo \ PUSH_BRANCHES=$(echo \ master \ + {release,maint}-0.4.3 \ {release,maint}-0.4.2 \ {release,maint}-0.4.1 \ - {release,maint}-0.4.0 \ {release,maint}-0.3.5 \ ) @@ -206,9 +206,9 @@ if [ -z "$TEST_BRANCH_PREFIX" ]; then # List of branches to push. Ordering is not important. PUSH_BRANCHES=$(echo \ master \ + {release,maint}-0.4.3 \ {release,maint}-0.4.2 \ {release,maint}-0.4.1 \ - {release,maint}-0.4.0 \ {release,maint}-0.3.5 \ ) else @@ -218,9 +218,9 @@ else # List of branches to push. Ordering is not important. PUSH_BRANCHES=" \ ${TEST_BRANCH_PREFIX}_master \ + ${TEST_BRANCH_PREFIX}_043 \ ${TEST_BRANCH_PREFIX}_042 \ ${TEST_BRANCH_PREFIX}_041 \ - ${TEST_BRANCH_PREFIX}_040 \ ${TEST_BRANCH_PREFIX}_035 \ " fi diff --git a/scripts/git/git-setup-dirs.sh b/scripts/git/git-setup-dirs.sh index 20a148204..2d16cc1d6 100755 --- a/scripts/git/git-setup-dirs.sh +++ b/scripts/git/git-setup-dirs.sh @@ -97,15 +97,15 @@ GITHUB_PUSH=${TOR_GITHUB_PUSH:-"No_Pushing_To_GitHub"} # First set of arrays are the maint-* branch and then the release-* branch. # New arrays need to be in the WORKTREE= array else they aren't considered. MAINT_035=( "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" ) -MAINT_040=( "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.0" ) MAINT_041=( "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" ) MAINT_042=( "maint-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.2" ) +MAINT_043=( "maint-0.4.3" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.3" ) MAINT_MASTER=( "master" "$GIT_PATH/$TOR_MASTER_NAME" ) RELEASE_035=( "release-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" ) -RELEASE_040=( "release-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.0" ) RELEASE_041=( "release-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.1" ) RELEASE_042=( "release-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.2" ) +RELEASE_043=( "release-0.4.3" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.3" ) # The master branch path has to be the main repository thus contains the # origin that will be used to fetch the updates. All the worktrees are created @@ -115,14 +115,14 @@ ORIGIN_PATH="$GIT_PATH/$TOR_MASTER_NAME" # SC2034 -- shellcheck thinks that these are unused. We know better. ACTUALLY_THESE_ARE_USED=<<EOF ${MAINT_035[0]} -${MAINT_040[0]} ${MAINT_041[0]} ${MAINT_042[0]} +${MAINT_043[0]} ${MAINT_MASTER[0]} ${RELEASE_035[0]} -${RELEASE_040[0]} ${RELEASE_041[0]} ${RELEASE_042[0]} +${RELEASE_043[0]} EOF ####################### @@ -165,15 +165,15 @@ WORKTREE=( MAINT_035[@] RELEASE_035[@] - MAINT_040[@] - RELEASE_040[@] - MAINT_041[@] RELEASE_041[@] MAINT_042[@] RELEASE_042[@] + MAINT_043[@] + RELEASE_043[@] + MAINT_MASTER[@] )

1 0

[tor/master] Merge branch 'tor-github/pr/1717'
by dgoulet＠torproject.org 11 Feb '20

11 Feb '20

commit 2a524662c3f8a44acd273fd0e60e161cb9a2ed0f Merge: 80c5c874c 7404b6fb7 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 11 10:52:49 2020 -0500 Merge branch 'tor-github/pr/1717' scripts/git/git-merge-forward.sh | 28 ++++++++++++++-------------- scripts/git/git-pull-all.sh | 14 +++++++------- scripts/git/git-push-all.sh | 10 +++++----- scripts/git/git-setup-dirs.sh | 14 +++++++------- 4 files changed, 33 insertions(+), 33 deletions(-)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 11 Feb '20

11 Feb '20

commit 98a10475b2e3ff7fece876429694c22291806ff7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 11 15:20:10 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+el.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contents+el.po b/contents+el.po index 6d95688bc0..9adaaa320c 100644 --- a/contents+el.po +++ b/contents+el.po @@ -692,7 +692,7 @@ msgid "" "Service Provider or by a government." msgstr "" "Η άμεση πρόσβαση στο δίκτυο Tor μπορεί μερικές φορές να παρεμποδιστεί από " -"τον πάροχο υπηρεσιών του διαδικτύου σας ή από την κυβέρνηση." +"τον Πάροχο Υπηρεσιών Διαδικτύου σας ή από την κυβέρνηση." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -982,6 +982,8 @@ msgstr "" #: (content/bridges/contents+en.lrtopic.body) msgid "* Use MOAT to fetch bridges from within Tor Browser." msgstr "" +"* Χρησιμοποιήστε το MOAT για να μεταφέρετε τις γέφυρες μέσα από το Tor " +"Browser." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -2396,6 +2398,8 @@ msgid "" "1. Plug in your removable media and format it. You *must* use macOS Extended" " (Journaled) format." msgstr "" +"1. Συνδέστε το αφαιρούμενο μέσο και διαμορφώστε το. *Πρέπει* να " +"χρησιμοποιήσετε τη μορφή Επέκτασης macOS Extended (Journaled)." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 11 Feb '20

11 Feb '20

commit 7f0de0f813eddef779cf2c8ed97f26fd68e2351a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 11 13:53:56 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+el.po | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/contents+el.po b/contents+el.po index 14500a806b..3ab7e0f5c7 100644 --- a/contents+el.po +++ b/contents+el.po @@ -8590,20 +8590,21 @@ msgstr "" #: lego/templates/banner.html:3 lego/templates/banner.html:5 #: templates/banner.html:3 templates/banner.html:5 msgid "Close banner" -msgstr "" +msgstr "Κλείσιμο του banner" #: lego/templates/banner.html:11 templates/banner.html:11 msgid "Tracking, surveillance, and censorship are widespread online." msgstr "" +"Η παρακολούθηση, η επιτήρηση και η λογοκρισία είναι ευρέως διαδεδομένες." #: lego/templates/banner.html:20 templates/banner.html:20 msgid "TAKE BACK THE INTERNET WITH TOR" -msgstr "" +msgstr "ΕΠΙΣΤΡΕΨΤΕ ΣΤΟ ΔΙΑΔΙΚΤΥΟ ΜΕ ΤΟ TOR" #: lego/templates/banner.html:33 lego/templates/banner.html:35 #: templates/banner.html:33 templates/banner.html:35 msgid "DONATE NOW" -msgstr "" +msgstr "ΔΩΡΙΣTΕ ΤΩΡΑ" #: lego/templates/banner.html:37 templates/banner.html:37 msgid "Give today, and Mozilla will match your donation." @@ -8620,6 +8621,8 @@ msgid "" "Download Tor Browser to experience real private browsing without tracking, " "surveillance, or censorship." msgstr "" +"Κάντε λήψη του Tor Browser για να ζήσετε τη πραγματική ιδιωτική περιήγηση " +"χωρίς παρακολούθηση, επιτήρηση ή λογοκρισία." #: lego/templates/footer.html:28 templates/footer.html:28 msgid "Our mission:" @@ -8651,7 +8654,7 @@ msgstr "Εγγραφείτε στο Newsletter μας" #: lego/templates/footer.html:67 templates/footer.html:67 msgid "Get monthly updates and opportunities from the Tor Project:" -msgstr "" +msgstr "Λάβετε μηνιαίες ενημερώσεις και ευκαιρίες από το Tor Project" #: lego/templates/footer.html:68 templates/footer.html:68 msgid "Sign up" @@ -8730,7 +8733,7 @@ msgstr "Tor" #: lego/templates/secure-connections.html:32 #: templates/secure-connections.html:32 msgid "POTENTIALLY VISIBLE DATA" -msgstr "" +msgstr "ΠΙΘΑΝΩΣ ΟΡΑΤΑ ΔΕΔΟΜΕΝΑ" #: lego/templates/secure-connections.html:37 #: templates/secure-connections.html:37 @@ -8785,6 +8788,8 @@ msgstr "Αν χρησιμοποιείται Tor ή όχι." msgid "" "Defend yourself against tracking and surveillance. Circumvent censorship." msgstr "" +"Προστατεύστε τον εαυτό σας από την παρακολούθηση και την επιτήρηση. " +"Παράκαμψη λογοκρισίας." #: templates/layout.html:10 msgid "Tor Project | Support" @@ -8796,15 +8801,15 @@ msgstr "Θέματα" #: templates/macros/question.html:16 msgid "Contributors to this page:" -msgstr "" +msgstr "Συνεισφέροντες σε αυτή τη σελίδα:" #: templates/macros/question.html:18 msgid "Edit this page" -msgstr "" +msgstr "Επεξεργασία αυτής της σελίδας" #: templates/macros/question.html:19 msgid "Suggest Feedback" -msgstr "" +msgstr "Προτείνετε σχόλια" #: templates/macros/question.html:20 msgid "Permalink"

1 0

[tor/maint-0.4.1] Remove a redundant practracker exception line in maint-0.4.1
by nickm＠torproject.org 11 Feb '20

11 Feb '20

commit 0ff3e8f4a0fd5b661e999c0a81ceb1c55e7456c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 08:52:23 2020 -0500 Remove a redundant practracker exception line in maint-0.4.1 This will our "git push" hook not complain about pushing from maint-0.4.1. --- scripts/maint/practracker/exceptions.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 726dc9c3e..eaa98f0f2 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -88,7 +88,6 @@ problem function-size /src/core/or/circuitlist.c:circuits_handle_oom() 117 problem function-size /src/core/or/circuitmux.c:circuitmux_set_policy() 110 problem function-size /src/core/or/circuitmux.c:circuitmux_attach_circuit() 114 problem file-size /src/core/or/circuitpadding.c 3040 -problem function-size /src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 107 problem function-size /src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 113 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

1 0

[tor/maint-0.4.2] Remove a redundant practracker exception line in maint-0.4.1
by nickm＠torproject.org 11 Feb '20

11 Feb '20

commit 0ff3e8f4a0fd5b661e999c0a81ceb1c55e7456c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 08:52:23 2020 -0500 Remove a redundant practracker exception line in maint-0.4.1 This will our "git push" hook not complain about pushing from maint-0.4.1. --- scripts/maint/practracker/exceptions.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 726dc9c3e..eaa98f0f2 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -88,7 +88,6 @@ problem function-size /src/core/or/circuitlist.c:circuits_handle_oom() 117 problem function-size /src/core/or/circuitmux.c:circuitmux_set_policy() 110 problem function-size /src/core/or/circuitmux.c:circuitmux_attach_circuit() 114 problem file-size /src/core/or/circuitpadding.c 3040 -problem function-size /src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 107 problem function-size /src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 113 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

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 11 Feb '20

11 Feb '20

commit 00fe214729b935adc522883fa84b399429fefa74 Merge: 0c90fc37e 0ff3e8f4a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 08:53:00 2020 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 "ours" merge, since the exceptions.txt file is already fixed in this branch.

1 0

[tor/master] Remove a redundant practracker exception line in maint-0.4.1
by nickm＠torproject.org 11 Feb '20

11 Feb '20

commit 0ff3e8f4a0fd5b661e999c0a81ceb1c55e7456c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 08:52:23 2020 -0500 Remove a redundant practracker exception line in maint-0.4.1 This will our "git push" hook not complain about pushing from maint-0.4.1. --- scripts/maint/practracker/exceptions.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 726dc9c3e..eaa98f0f2 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -88,7 +88,6 @@ problem function-size /src/core/or/circuitlist.c:circuits_handle_oom() 117 problem function-size /src/core/or/circuitmux.c:circuitmux_set_policy() 110 problem function-size /src/core/or/circuitmux.c:circuitmux_attach_circuit() 114 problem file-size /src/core/or/circuitpadding.c 3040 -problem function-size /src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 107 problem function-size /src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 113 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

1 0

[tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 11 Feb '20

11 Feb '20

commit 00fe214729b935adc522883fa84b399429fefa74 Merge: 0c90fc37e 0ff3e8f4a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 08:53:00 2020 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 "ours" merge, since the exceptions.txt file is already fixed in this branch.

1 0