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

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

23 Jan '17

commit d83aa8c90ad99bed08691240e7320441b811b2d7 Merge: 9899045 bcbb2d1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jan 22 19:03:25 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug20307 | 7 +++++++ src/or/or.h | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.9] circuit: Change close reasons from uint16_t to int
by nickm＠torproject.org 23 Jan '17

23 Jan '17

commit 96c7ddbc7e8a38385fa0f7b5d810d0bf8bdf6990 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Dec 22 12:37:42 2016 -0500 circuit: Change close reasons from uint16_t to int When marking for close a circuit, the reason value, a integer, was assigned to a uint16_t converting any negative reasons (internal) to the wrong value. On the HS side, this was causing the client to flag introduction points to be unreachable as the internal reason was wrongfully converted to a positive 16bit value leading to flag 2 out of 3 intro points to be unreachable. Fixes #20307 and partially fixes #21056 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug20307 | 7 +++++++ src/or/or.h | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug20307 b/changes/bug20307 new file mode 100644 index 0000000..6036b99 --- /dev/null +++ b/changes/bug20307 @@ -0,0 +1,7 @@ + o Minor bugfixes (circuit, hidden service) + - When closing a circuit, the reason for doing so was assigned from a int + value to a uint16_t which is quite a problem for negative value that are + our internal reasons (ex: END_CIRC_REASON_IP_NOW_REDUNDANT). On the HS + side, this was causing introduction point to be flagged as unusable + because the reason wasn't the right one due to the bad conversion. + Partially fixes #21056 and fixes #20307; Bugfix on tor-0.2.8.1-alpha. diff --git a/src/or/or.h b/src/or/or.h index 6671779..b7c67ba 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2964,11 +2964,11 @@ typedef struct circuit_t { /** For what reason (See END_CIRC_REASON...) is this circuit being closed? * This field is set in circuit_mark_for_close and used later in * circuit_about_to_free. */ - uint16_t marked_for_close_reason; + int marked_for_close_reason; /** As marked_for_close_reason, but reflects the underlying reason for * closing this circuit. */ - uint16_t marked_for_close_orig_reason; + int marked_for_close_orig_reason; /** Unique ID for measuring tunneled network status requests. */ uint64_t dirreq_id;

1 0

[tor/maint-0.2.9] circuit: Change close reasons from uint16_t to int
by nickm＠torproject.org 23 Jan '17

23 Jan '17

commit 96c7ddbc7e8a38385fa0f7b5d810d0bf8bdf6990 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Dec 22 12:37:42 2016 -0500 circuit: Change close reasons from uint16_t to int When marking for close a circuit, the reason value, a integer, was assigned to a uint16_t converting any negative reasons (internal) to the wrong value. On the HS side, this was causing the client to flag introduction points to be unreachable as the internal reason was wrongfully converted to a positive 16bit value leading to flag 2 out of 3 intro points to be unreachable. Fixes #20307 and partially fixes #21056 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug20307 | 7 +++++++ src/or/or.h | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug20307 b/changes/bug20307 new file mode 100644 index 0000000..6036b99 --- /dev/null +++ b/changes/bug20307 @@ -0,0 +1,7 @@ + o Minor bugfixes (circuit, hidden service) + - When closing a circuit, the reason for doing so was assigned from a int + value to a uint16_t which is quite a problem for negative value that are + our internal reasons (ex: END_CIRC_REASON_IP_NOW_REDUNDANT). On the HS + side, this was causing introduction point to be flagged as unusable + because the reason wasn't the right one due to the bad conversion. + Partially fixes #21056 and fixes #20307; Bugfix on tor-0.2.8.1-alpha. diff --git a/src/or/or.h b/src/or/or.h index 6671779..b7c67ba 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2964,11 +2964,11 @@ typedef struct circuit_t { /** For what reason (See END_CIRC_REASON...) is this circuit being closed? * This field is set in circuit_mark_for_close and used later in * circuit_about_to_free. */ - uint16_t marked_for_close_reason; + int marked_for_close_reason; /** As marked_for_close_reason, but reflects the underlying reason for * closing this circuit. */ - uint16_t marked_for_close_orig_reason; + int marked_for_close_orig_reason; /** Unique ID for measuring tunneled network status requests. */ uint64_t dirreq_id;

1 0

[tor/maint-0.2.9] clean up grammar on bug20307 changes file
by nickm＠torproject.org 23 Jan '17

23 Jan '17

commit bcbb2d111bb08a9578d31e0240a24af8137dc766 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Jan 13 18:09:50 2017 -0500 clean up grammar on bug20307 changes file pointed out by toralf on irc --- changes/bug20307 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/changes/bug20307 b/changes/bug20307 index 6036b99..9112c9c 100644 --- a/changes/bug20307 +++ b/changes/bug20307 @@ -1,7 +1,7 @@ o Minor bugfixes (circuit, hidden service) - - When closing a circuit, the reason for doing so was assigned from a int - value to a uint16_t which is quite a problem for negative value that are + - When closing a circuit, the reason for doing so was assigned from an int + value to a uint16_t which is quite a problem for negative values that are our internal reasons (ex: END_CIRC_REASON_IP_NOW_REDUNDANT). On the HS - side, this was causing introduction point to be flagged as unusable + side, this was causing introduction points to be flagged as unusable because the reason wasn't the right one due to the bad conversion. - Partially fixes #21056 and fixes #20307; Bugfix on tor-0.2.8.1-alpha. + Partially fixes bug 21056 and fixes bug 20307; Bugfix on 0.2.8.1-alpha.

1 0

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

23 Jan '17

commit 98990452564a6c3f70bce05a299d84fb7c0024a3 Merge: 2c9ce8d 46aee42 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jan 22 18:54:25 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/geoip-january2017 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 23 Jan '17

23 Jan '17

commit 753f6a9e70717172c0d4cd0932ba8f259664b747 Merge: e52f49a 46aee42 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jan 22 18:48:27 2017 -0500 Merge branch 'maint-0.2.9' changes/geoip-january2017 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] fix a lintchanges warning
by nickm＠torproject.org 23 Jan '17

23 Jan '17

commit 46aee42cb99dcf3cba69091aeceb1f61d3961f3a Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jan 22 18:48:22 2017 -0500 fix a lintchanges warning --- changes/geoip-january2017 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/geoip-january2017 b/changes/geoip-january2017 index de1a4cb..77bc9a5 100644 --- a/changes/geoip-january2017 +++ b/changes/geoip-january2017 @@ -1,4 +1,4 @@ - o Minor features: + o Minor features (geoip): - Update geoip and geoip6 to the January 4 2017 Maxmind GeoLite2 Country database.

1 0

[tor/release-0.2.9] fix a lintchanges warning
by nickm＠torproject.org 23 Jan '17

23 Jan '17

commit 46aee42cb99dcf3cba69091aeceb1f61d3961f3a Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jan 22 18:48:22 2017 -0500 fix a lintchanges warning --- changes/geoip-january2017 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/geoip-january2017 b/changes/geoip-january2017 index de1a4cb..77bc9a5 100644 --- a/changes/geoip-january2017 +++ b/changes/geoip-january2017 @@ -1,4 +1,4 @@ - o Minor features: + o Minor features (geoip): - Update geoip and geoip6 to the January 4 2017 Maxmind GeoLite2 Country database.

1 0

[tor/maint-0.2.9] fix a lintchanges warning
by nickm＠torproject.org 23 Jan '17

23 Jan '17

commit 46aee42cb99dcf3cba69091aeceb1f61d3961f3a Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jan 22 18:48:22 2017 -0500 fix a lintchanges warning --- changes/geoip-january2017 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/geoip-january2017 b/changes/geoip-january2017 index de1a4cb..77bc9a5 100644 --- a/changes/geoip-january2017 +++ b/changes/geoip-january2017 @@ -1,4 +1,4 @@ - o Minor features: + o Minor features (geoip): - Update geoip and geoip6 to the January 4 2017 Maxmind GeoLite2 Country database.

1 0

[tor/master] Fix warnings from lintchanges script
by nickm＠torproject.org 23 Jan '17

23 Jan '17

commit 955846fbabfa84191d921570ddbb1e263551ebc7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jan 22 18:54:13 2017 -0500 Fix warnings from lintchanges script --- changes/bug19899 | 2 +- changes/bug19953 | 8 ++++---- changes/bug20307 | 2 +- changes/bug20502 | 2 +- changes/bug21033 | 4 ++-- changes/bug21054 | 4 ++-- changes/bug21058 | 2 +- changes/bug21062 | 4 ++-- changes/bug21142 | 2 +- changes/fallbacks-201612 | 12 ++++++------ 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/changes/bug19899 b/changes/bug19899 index af110bd..c4038cf 100644 --- a/changes/bug19899 +++ b/changes/bug19899 @@ -1,4 +1,4 @@ - o Minor features: + o Minor features (hidden service directories): - Relays are now willing act as v3 hidden service directories, regardless of the EnableOnionServicvesV3 parameter. Implements ticket 19899. diff --git a/changes/bug19953 b/changes/bug19953 index 919018d..4bfcb0e 100644 --- a/changes/bug19953 +++ b/changes/bug19953 @@ -1,6 +1,6 @@ - o Minor bugfixes (relay) + o Minor bugfixes (relay): - Honor DataDirectoryGroupReadable when tor is a relay. Previously, the initialization of the keys would reset the DataDirectory to 0700 instead - of 0750 if DataDirectoryGroupReadable was set to 1. Fixes #19953. Patch - by "redfish".; bugfix on tor-0.0.2pre16. - + of 0750 if DataeDirectoryGroupReadable was set to 1. Fixes bug 19953; + bugfix on 0.0.2pre16. + Patch by "redfish". diff --git a/changes/bug20307 b/changes/bug20307 index 9112c9c..ae9f90b 100644 --- a/changes/bug20307 +++ b/changes/bug20307 @@ -4,4 +4,4 @@ our internal reasons (ex: END_CIRC_REASON_IP_NOW_REDUNDANT). On the HS side, this was causing introduction points to be flagged as unusable because the reason wasn't the right one due to the bad conversion. - Partially fixes bug 21056 and fixes bug 20307; Bugfix on 0.2.8.1-alpha. + Partially fixes bug 21056 and fixes bug 20307; bugfix on 0.2.8.1-alpha. diff --git a/changes/bug20502 b/changes/bug20502 index d956daf..1390a0b 100644 --- a/changes/bug20502 +++ b/changes/bug20502 @@ -1,4 +1,4 @@ - o Minor features + o Minor features (entry guards): - Require UseEntryGuards when UseBridges is set in order to make sure bridges aren't bypassed. Resolves ticket 20502. - Add UseEntryGuards to TEST_OPTIONS_DEFAULT_VALUES in order to not break diff --git a/changes/bug21033 b/changes/bug21033 index c4b3dea..f49577a 100644 --- a/changes/bug21033 +++ b/changes/bug21033 @@ -1,5 +1,5 @@ o Minor bugfixes (hidden service): - Restrict the number of introduction point from 0 to the maximum allowed instead of the default value to the maximum. That was stopping operators - from using less than 3 introduction points. Closes #21033; bugfix on - tor-0.2.7.2-alpha. + from using less than 3 introduction points. Fixes bug 21033; bugfix on + 0.2.7.2-alpha. diff --git a/changes/bug21054 b/changes/bug21054 index bc49949..34a0cca 100644 --- a/changes/bug21054 +++ b/changes/bug21054 @@ -1,5 +1,5 @@ o Minor bugfixes (hidden service): - Fix the config reload pruning of old vs new services so it actually works when both ephemeral and non ephemeral services were configured - which lead to a BUG() stacktrace. Close #21054; Bugfix on - tor-0.3.0.1-alpha. + which lead to a BUG() stacktrace. Fixes bug 21054; bugfix on + 0.3.0.1-alpha. diff --git a/changes/bug21058 b/changes/bug21058 index 194b529..8ca2037 100644 --- a/changes/bug21058 +++ b/changes/bug21058 @@ -1,3 +1,3 @@ o Documentation (man page): - Clarify a number of options in tor.1 and add some min/max values for - HiddenService options. Closes #21058. + HiddenService options. Closes ticket 21058. diff --git a/changes/bug21062 b/changes/bug21062 index 3297e1e..5e4060e 100644 --- a/changes/bug21062 +++ b/changes/bug21062 @@ -1,4 +1,4 @@ - o Minor bugfixex (config): + o Minor bugfixes (config): - Don't assert when trying to get the options list when LearnCircuitBuildTimeout is set to 0 and we are actually currently - parsing the options. Fixes #21062; bugfix on tor-0.2.9.3-alpha. + parsing the options. Fixes bug 21062; bugfix on 0.2.9.3-alpha. diff --git a/changes/bug21142 b/changes/bug21142 index e232f43..5ead10d 100644 --- a/changes/bug21142 +++ b/changes/bug21142 @@ -1,4 +1,4 @@ o Minor bugfixes (client, guards): - Fix bug where Tor would think that there are circuits waiting for better - guards even though those circuits have been freed. Fixes bug #21142; + guards even though those circuits have been freed. Fixes bug 21142; bugfix on 0.3.0.1-alpha. diff --git a/changes/fallbacks-201612 b/changes/fallbacks-201612 index d9a67fd..b31aceb 100644 --- a/changes/fallbacks-201612 +++ b/changes/fallbacks-201612 @@ -8,8 +8,7 @@ 7 dayss. (Due to the number of relays with enough stability.) Relays whose OnionOO stability timer is reset on restart by bug 18050 should upgrade to Tor 0.2.8.7 or later, which has a fix for this issue. - Closes ticket 20880; maintains short-term fix in e220214 in - tor-0.2.8.2-alpha. + Closes ticket 20880; maintains short-term fix in 0.2.8.2-alpha. - Make it easier to change the output sort order of fallbacks. Closes ticket 20822. - Exclude relays affected by 20499 from the fallback list. Exclude known @@ -25,13 +24,14 @@ - Allow 3 fallbacks per operator. (This is safe now we are choosing 200 fallbacks.) Closes ticket 20912. - Reduce the minimum fallback bandwidth to 1 MByte/s. - Part of #18828. + Part of ticket 18828. + o Minor bugfixes (fallback directories): - Stop failing when OUTPUT_COMMENTS is True in updateFallbackDirs.py. - Closes ticket 20877; bugfix on commit 9998343 in tor-0.2.8.3-alpha. + Fixes bug 20877; bugfix on 0.2.8.3-alpha. - Avoid checking fallback candidates' DirPorts if they are down in OnionOO. When a relay operator has multiple relays, this prioritises relays that are up over relays that are down. - Closes ticket #20926; bugfix on 0.2.8.3-alpha. + Fixes bug 20926; bugfix on 0.2.8.3-alpha. - Stop failing when a relay has no uptime data in updateFallbackDirs.py. - Closes ticket 20945; bugfix on tor-0.2.8.1-alpha. + Fixes bug 20945; bugfix on 0.2.8.1-alpha.

1 0