April 2016 - tor-commits - lists.torproject.org

[tor/release-0.2.8] Merge branch 'bug18133_027' into maint-0.2.8
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit fdb57db581d4510b621fba087d9a7979934ea871 Merge: e247093 4093f34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 1 08:17:56 2016 -0400 Merge branch 'bug18133_027' into maint-0.2.8 changes/bug18133 | 4 ++++ src/or/routerkeys.c | 4 ++++ 2 files changed, 8 insertions(+)

1 0

[tor/maint-0.2.8] Log a better message when OfflineMasterKey is set.
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit 005a20ec859aa1c9e2f6d6bf5a1e70069f7f20f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 21 11:57:23 2016 -0400 Log a better message when OfflineMasterKey is set. Fixes bug 18133; bugfix on 0.2.7.2-alpha. --- changes/bug18133 | 4 ++++ src/or/routerkeys.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/changes/bug18133 b/changes/bug18133 new file mode 100644 index 0000000..177d286 --- /dev/null +++ b/changes/bug18133 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - When we can't generate a signing key because OfflineMasterKey is set, + do not imply that we should have been able to load it. + Fixes bug 18133; bugfix on 0.2.7.2-alpha. diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index d88bfca..8006112 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -427,6 +427,10 @@ ed_key_init_from_file(const char *fname, uint32_t flags, "but it was encrypted. Try 'tor --keygen' instead, so you " "can enter the passphrase.", secret_fname); + } else if (offline_secret) { + tor_log(severity, LD_OR, "We wanted to load a secret key from %s, " + "but you're keeping it offline. (OfflineMasterKey is set.)", + secret_fname); } else { tor_log(severity, LD_OR, "We needed to load a secret key from %s, " "but couldn't find it. %s", secret_fname,

1 0

[tor/maint-0.2.8] fix indentation
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit 4093f343caa576a28269ecdff0c3025f081b058a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 1 08:16:21 2016 -0400 fix indentation --- src/or/routerkeys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index 8006112..24ed31f 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -428,7 +428,7 @@ ed_key_init_from_file(const char *fname, uint32_t flags, "can enter the passphrase.", secret_fname); } else if (offline_secret) { - tor_log(severity, LD_OR, "We wanted to load a secret key from %s, " + tor_log(severity, LD_OR, "We wanted to load a secret key from %s, " "but you're keeping it offline. (OfflineMasterKey is set.)", secret_fname); } else {

1 0

[tor/maint-0.2.8] Merge branch 'bug18133_027' into maint-0.2.8
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit fdb57db581d4510b621fba087d9a7979934ea871 Merge: e247093 4093f34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 1 08:17:56 2016 -0400 Merge branch 'bug18133_027' into maint-0.2.8 changes/bug18133 | 4 ++++ src/or/routerkeys.c | 4 ++++ 2 files changed, 8 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'karsten/task-18460-2' into maint-0.2.8
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit e247093e0efba100ec6f3abdfa9d3433d51389f0 Merge: ba87f5b b79d859 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 1 08:10:58 2016 -0400 Merge remote-tracking branch 'karsten/task-18460-2' into maint-0.2.8 changes/bug18460 | 4 ++++ src/or/directory.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-)

1 0

[tor/master] Include IPv6 consensus downloads in dirreq stats.
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit b79d8590c914c394e3edb3bfab5a39fc649fe071 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Mar 25 20:53:36 2016 +0100 Include IPv6 consensus downloads in dirreq stats. Fixes #18460. --- changes/bug18460 | 4 ++++ src/or/directory.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/changes/bug18460 b/changes/bug18460 new file mode 100644 index 0000000..457e5df --- /dev/null +++ b/changes/bug18460 @@ -0,0 +1,4 @@ + o Minor bugfixes (statistics): + - Include consensus downloads via IPv6 in directory-request statistics. + Fixes bug 18480; bugfix on 4741aa4 in 0.2.3.14-alpha. + diff --git a/src/or/directory.c b/src/or/directory.c index e4feda4..b269a3f 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2956,10 +2956,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, } if (1) { - struct in_addr in; tor_addr_t addr; - if (tor_inet_aton((TO_CONN(conn))->address, &in)) { - tor_addr_from_ipv4h(&addr, ntohl(in.s_addr)); + if (tor_addr_parse(&addr, (TO_CONN(conn))->address) >= 0) { geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, &addr, NULL, time(NULL));

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit 9e57ffa520bb0e8b9a7dd32e005e6b29a3f8bdfa Merge: 93c311d e247093 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 1 08:15:05 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18460 | 4 ++++ src/or/directory.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.8] Include IPv6 consensus downloads in dirreq stats.
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit b79d8590c914c394e3edb3bfab5a39fc649fe071 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Mar 25 20:53:36 2016 +0100 Include IPv6 consensus downloads in dirreq stats. Fixes #18460. --- changes/bug18460 | 4 ++++ src/or/directory.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/changes/bug18460 b/changes/bug18460 new file mode 100644 index 0000000..457e5df --- /dev/null +++ b/changes/bug18460 @@ -0,0 +1,4 @@ + o Minor bugfixes (statistics): + - Include consensus downloads via IPv6 in directory-request statistics. + Fixes bug 18480; bugfix on 4741aa4 in 0.2.3.14-alpha. + diff --git a/src/or/directory.c b/src/or/directory.c index e4feda4..b269a3f 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2956,10 +2956,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, } if (1) { - struct in_addr in; tor_addr_t addr; - if (tor_inet_aton((TO_CONN(conn))->address, &in)) { - tor_addr_from_ipv4h(&addr, ntohl(in.s_addr)); + if (tor_addr_parse(&addr, (TO_CONN(conn))->address) >= 0) { geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, &addr, NULL, time(NULL));

1 0

[tor/release-0.2.8] Fix my dumb unreleased bug in 18673
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit ba87f5bb25cd001ab8560f23a88e60a504c7059a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 28 20:09:09 2016 -0400 Fix my dumb unreleased bug in 18673 --- src/or/circuitlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 670c5b3..1efb7ef 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -760,7 +760,7 @@ or_circuit_new(circid_t p_circ_id, channel_t *p_chan) void circuit_clear_testing_cell_stats(circuit_t *circ) { - if (!circ) + if (!circ || !circ->testing_cell_stats) return; SMARTLIST_FOREACH(circ->testing_cell_stats, testing_cell_stats_entry_t *, ent, tor_free(ent));

1 0

[tor/release-0.2.8] Merge remote-tracking branch 'karsten/task-18460-2' into maint-0.2.8
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit e247093e0efba100ec6f3abdfa9d3433d51389f0 Merge: ba87f5b b79d859 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 1 08:10:58 2016 -0400 Merge remote-tracking branch 'karsten/task-18460-2' into maint-0.2.8 changes/bug18460 | 4 ++++ src/or/directory.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-)

1 0