tor-commits October 2013

tor-commits@lists.torproject.org

17 participants
1284 discussions

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug9927' into maint-0.2.4
by nickm＠torproject.org 08 Oct '13

08 Oct '13

commit 50fc8fb5c5b591fbcaa7e9d5572fa52a1e1b19ae Merge: 7e0f1fa c7c2478 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 8 13:37:13 2013 -0400 Merge remote-tracking branch 'public/bug9927' into maint-0.2.4 changes/bug9927 | 4 ++++ src/or/directory.c | 2 ++ src/or/relay.c | 1 + 3 files changed, 7 insertions(+)

1 0

[tor/maint-0.2.4] Generate bootstrapping status messages for microdescs too
by nickm＠torproject.org 08 Oct '13

08 Oct '13

commit c7c24785ee1b846c608ae4691df7d10476885b66 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 8 11:31:08 2013 -0400 Generate bootstrapping status messages for microdescs too Fix for 9927. --- changes/bug9927 | 4 ++++ src/or/directory.c | 2 ++ src/or/relay.c | 1 + 3 files changed, 7 insertions(+) diff --git a/changes/bug9927 b/changes/bug9927 new file mode 100644 index 0000000..e66280c --- /dev/null +++ b/changes/bug9927 @@ -0,0 +1,4 @@ + o Minor features: + - Generate bootstrapping status update events correctly for fetching + microdescriptors. Fixes bug 9927. + diff --git a/src/or/directory.c b/src/or/directory.c index b4381ac..3752367 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2111,6 +2111,8 @@ connection_dir_client_reached_eof(dir_connection_t *conn) /* Mark remaining ones as failed. */ dir_microdesc_download_failed(which, status_code); } + control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS, + count_loading_descriptors_progress()); SMARTLIST_FOREACH(which, char *, cp, tor_free(cp)); smartlist_free(which); smartlist_free(mds); diff --git a/src/or/relay.c b/src/or/relay.c index 3138c5e..29dc361 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1103,6 +1103,7 @@ connection_edge_process_relay_cell_not_open( control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_STATUS, 0); break; case DIR_PURPOSE_FETCH_SERVERDESC: + case DIR_PURPOSE_FETCH_MICRODESC: control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS, count_loading_descriptors_progress()); break;

1 0

[tor/master] Tweak a comment
by nickm＠torproject.org 08 Oct '13

08 Oct '13

commit b571b966f2cc39e906a27bec6ae4f3e1e4376299 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 8 12:18:31 2013 -0400 Tweak a comment --- src/or/router.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/router.c b/src/or/router.c index edae267..317cef2 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -232,7 +232,8 @@ get_server_identity_key(void) return server_identitykey; } -/** Return true iff the server identity key has been set. */ +/** Return true iff we are a server and the server identity key + * has been set. */ int server_identity_key_is_set(void) {

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 08 Oct '13

08 Oct '13

commit 1060688d2a351329ad6a4b751e312242b57531a0 Merge: 5e04042 7e0f1fa Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 8 12:17:14 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug6979 | 4 ++++ src/or/router.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 08 Oct '13

08 Oct '13

commit 7e0f1fa52adcf67d7b9c5459a3cc74f57bbfa3e2 Merge: 0c3c475 dece40f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 8 12:16:42 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/bug6979 | 4 ++++ src/or/router.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Fix an assert when disabling ORPort with accounting disabled.
by nickm＠torproject.org 08 Oct '13

08 Oct '13

commit dece40fd7729934bc32906e94d3e5e746c01f970 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 18 10:26:32 2013 -0400 Fix an assert when disabling ORPort with accounting disabled. The problem was that the server_identity_key_is_set() function could return true under conditions where we don't really have an identity key -- specifically, where we used to have one, but we stopped being a server. This is a fix for 6979; bugfix on 0.2.2.18-alpha where we added that assertion to get_server_identity_key(). --- changes/bug6979 | 4 ++++ src/or/router.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug6979 b/changes/bug6979 new file mode 100644 index 0000000..55572ec --- /dev/null +++ b/changes/bug6979 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix an assertion failure that would occur when disabling the + ORPort setting on a running Tor process while accounting was + enabled. Fixes bug 6979; bugfix on 0.2.2.18-alpha. diff --git a/src/or/router.c b/src/or/router.c index 1ace8e2..a3459ae 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -177,7 +177,7 @@ get_server_identity_key(void) int server_identity_key_is_set(void) { - return server_identitykey != NULL; + return server_mode(get_options()) && server_identitykey != NULL; } /** Set the current client identity key to <b>k</b>.

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 08 Oct '13

08 Oct '13

1 0

[tor/maint-0.2.4] Fix an assert when disabling ORPort with accounting disabled.
by nickm＠torproject.org 08 Oct '13

08 Oct '13

1 0

[tor/maint-0.2.3] Fix an assert when disabling ORPort with accounting disabled.
by nickm＠torproject.org 08 Oct '13

08 Oct '13

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 08 Oct '13

08 Oct '13

commit 5e0404265fd0e1f297b4b587419870fcd58a9d7c Merge: 63234b1 0c3c475 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 8 12:11:37 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug9596 | 4 ++++ src/or/policies.h | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2013