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

[tor/maint-0.2.9] Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 8500f0e4e179280ebb8d6c1f3342eff21a4fdac2 Merge: 2b94b0ea7 ec5fe4120 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:28:36 2017 -0400 Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9 changes/bug20059 | 3 +++ src/or/onion.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.9] Avoid a double-mark bug when makring a pending circuit as "too old"
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit ec5fe41209add4b216029466774a6b7e833210ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 15 09:19:00 2017 -0400 Avoid a double-mark bug when makring a pending circuit as "too old" Fixes bug 20059; bugfix on 0.1.0.1-rc. --- changes/bug20059 | 3 +++ src/or/onion.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug20059 b/changes/bug20059 new file mode 100644 index 000000000..091fab06d --- /dev/null +++ b/changes/bug20059 @@ -0,0 +1,3 @@ + o Minor bugfixes (relay): + - Avoid a double-marked-circuit warning that can happen when we receive + DESTROY cells under heavy load. Fixes bug 20059; bugfix on 0.1.0.1-rc. diff --git a/src/or/onion.c b/src/or/onion.c index 1a0bcf106..de4b6a584 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -184,7 +184,9 @@ onion_pending_add(or_circuit_t *circ, create_cell_t *onionskin) onion_queue_entry_remove(head); log_info(LD_CIRC, "Circuit create request is too old; canceling due to overload."); - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT); + if (! TO_CIRCUIT(circ)->marked_for_close) { + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT); + } } return 0; }

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit f69797b67cab3c5ad62d5a666b2919c3d29ef1e3 Merge: 84c4a2bc3 8500f0e4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:28:39 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0

1 0

[tor/maint-0.3.1] Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 8500f0e4e179280ebb8d6c1f3342eff21a4fdac2 Merge: 2b94b0ea7 ec5fe4120 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:28:36 2017 -0400 Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9 changes/bug20059 | 3 +++ src/or/onion.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.0] Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 8500f0e4e179280ebb8d6c1f3342eff21a4fdac2 Merge: 2b94b0ea7 ec5fe4120 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:28:36 2017 -0400 Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9 changes/bug20059 | 3 +++ src/or/onion.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 751c71827364f1c5d7291cc379c8ba977df1bf37 Merge: bf91b6e05 f69797b67 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:28:40 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1

1 0

[tor/master] Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 8500f0e4e179280ebb8d6c1f3342eff21a4fdac2 Merge: 2b94b0ea7 ec5fe4120 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:28:36 2017 -0400 Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9 changes/bug20059 | 3 +++ src/or/onion.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 9191069891322ba4754fb160e3cc5a117b59c9bd Merge: 50b8a449b 8500f0e4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:28:39 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug20059 | 3 +++ src/or/onion.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.9] Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 8500f0e4e179280ebb8d6c1f3342eff21a4fdac2 Merge: 2b94b0ea7 ec5fe4120 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:28:36 2017 -0400 Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9 changes/bug20059 | 3 +++ src/or/onion.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit ba7d6a1e141b23f1963567b34eb2d8c33d652218 Merge: 2ee1a084f 751c71827 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:28:40 2017 -0400 Merge branch 'maint-0.3.1'

1 0