tor-commits January 2018

tor-commits@lists.torproject.org

18 participants
1738 discussions

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit e81896adda197b705958bcbe2b9d2c5db839b8a5 Merge: ee5c624be 9c2bc441f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 09:50:24 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24859 | 4 ++++ src/or/consdiffmgr.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 76b73013e29661a55cbee098c5326b57d3ec6069 Merge: 0e0baad5e 9c2bc441f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 09:50:24 2018 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug24859 | 4 ++++ src/or/consdiffmgr.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.1] If out-of-disk when saving a consensus cache entry, don't BUG.
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 9c2bc441f8acf6fb47c7cc1f09c04974ee35d694 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 26 13:14:14 2018 -0500 If out-of-disk when saving a consensus cache entry, don't BUG. Just warn instead. Fixes bug 24859. --- changes/bug24859 | 4 ++++ src/or/consdiffmgr.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug24859 b/changes/bug24859 new file mode 100644 index 000000000..122109d65 --- /dev/null +++ b/changes/bug24859 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - Don't treat inability to store a cached consensus object as a + bug: it can happen normally when we are out of disk space. + Fixes bug 24859; bugfix on 0.3.1.1-alpha. diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index c5f55b6f3..e2bb31e52 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -1310,8 +1310,11 @@ store_multiple(consensus_cache_entry_handle_t **handles_out, labels, body_out, bodylen_out); - if (BUG(ent == NULL)) + if (ent == NULL) { + log_warn(LD_FS, "Unable to store object %s compressed with %s.", + description, methodname); continue; + } status = CDM_DIFF_PRESENT; handles_out[i] = consensus_cache_entry_handle_new(ent);

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 69e242f845fa53ee0930127dc9dccae8ca5c70e8 Merge: 914ec372a e81896add Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 09:50:24 2018 -0500 Merge branch 'maint-0.3.2' changes/bug24859 | 4 ++++ src/or/consdiffmgr.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] If out-of-disk when saving a consensus cache entry, don't BUG.
by nickm＠torproject.org 31 Jan '18

31 Jan '18

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 31 Jan '18

31 Jan '18

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 3d7f134bea38b94a2454dcabe0ce6d32dbbd3059 Merge: 6b629d309 e81896add Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 09:50:24 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24859 | 4 ++++ src/or/consdiffmgr.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/master] Remove a needless (always-true) check.
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 0755bcc36ac81e4a7d569b67f5e5a2267ed47620 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 26 13:35:00 2018 -0500 Remove a needless (always-true) check. Also add an assertion and rename a variable. Closes ticekt 24927. --- changes/bug24927 | 4 ++++ src/or/circuituse.c | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/changes/bug24927 b/changes/bug24927 new file mode 100644 index 000000000..699730695 --- /dev/null +++ b/changes/bug24927 @@ -0,0 +1,4 @@ + o Minor bugfixes (correctness): + - Remove nonworking, unnecessary check to see whether a circuit hop's + identity was set when the circuit failed. Fixes bug 24927; bugfix on + 0.2.4.4-alpha. diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 1ff1de465..3a14a3ccf 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1773,7 +1773,8 @@ circuit_build_failed(origin_circuit_t *circ) /* We failed at the first hop for some reason other than a DESTROY cell. * If there's an OR connection to blame, blame it. Also, avoid this relay * for a while, and fail any one-hop directory fetches destined for it. */ - const char *n_chan_id = circ->cpath->extend_info->identity_digest; + const char *n_chan_ident = circ->cpath->extend_info->identity_digest; + tor_assert(n_chan_ident); int already_marked = 0; if (circ->base_.n_chan) { n_chan = circ->base_.n_chan; @@ -1801,7 +1802,7 @@ circuit_build_failed(origin_circuit_t *circ) "with no connection", TO_CIRCUIT(circ)->n_circ_id, circ->global_identifier); } - if (n_chan_id && !already_marked) { + if (!already_marked) { /* * If we have guard state (new guard API) and our path selection * code actually chose a full path, then blame the failure of this @@ -1821,7 +1822,7 @@ circuit_build_failed(origin_circuit_t *circ) entry_guard_failed(&circ->guard_state); /* if there are any one-hop streams waiting on this circuit, fail * them now so they can retry elsewhere. */ - connection_ap_fail_onehop(n_chan_id, circ->build_state); + connection_ap_fail_onehop(n_chan_ident, circ->build_state); } }

1 0

[tor/master] Merge branch 'bug24927'
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 914ec372a9352308c3990afb5304f7e8d39b1020 Merge: 80c8689be 0755bcc36 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 09:47:36 2018 -0500 Merge branch 'bug24927' changes/bug24927 | 4 ++++ src/or/circuituse.c | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'public/ticket24849_032'
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 80c8689be1d0b6d926752059b51966d398f7c184 Merge: 94878cf1e 75d4bd349 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 09:38:24 2018 -0500 Merge remote-tracking branch 'public/ticket24849_032' changes/ticket24849 | 3 +++ src/or/dirvote.c | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-)

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
174
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2018