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

[tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.4
by teor＠torproject.org 19 Apr '19

19 Apr '19

commit 4d504bf098069538984690de7966a907180c7efe Merge: 48e990359 ec213ae8a Author: teor <teor(a)torproject.org> Date: Fri Apr 19 11:39:17 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.4 "ours" merge, to avoid taking any changes from PR 772 in 0.3.4. (We already merged a different fix for 23790 into 0.3.2 and later.)

1 0

[tor/release-0.2.9] Merge remote-tracking branch 'tor-github/pr/772' into maint-0.2.9
by teor＠torproject.org 19 Apr '19

19 Apr '19

commit ec213ae8a09505e97215cf9c54d1003c314c91f9 Merge: a0db5ade3 b4e44a371 Author: teor <teor(a)torproject.org> Date: Fri Apr 19 11:38:52 2019 +1000 Merge remote-tracking branch 'tor-github/pr/772' into maint-0.2.9 changes/bug23790 | 6 ++++++ src/or/rendservice.c | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+)

1 0

[tor/release-0.3.4] stats: Make PaddingStatistics depend on ExtraInfoStatistics
by teor＠torproject.org 19 Apr '19

19 Apr '19

commit 85c598cbc2d4ca1a7c729864002b5b222980ce19 Author: teor <teor(a)torproject.org> Date: Tue Jan 8 18:21:10 2019 +1000 stats: Make PaddingStatistics depend on ExtraInfoStatistics When ExtraInfoStatistics is 0, stop including PaddingStatistics in relay and bridge extra-info documents. Fixes bug 29017; bugfix on 0.3.1.1-alpha. --- changes/bug29017 | 4 ++++ doc/tor.1.txt | 2 +- src/or/router.c | 11 +++++------ 3 files changed, 10 insertions(+), 7 … [View More]

1 0

[tor/release-0.3.4] Merge branch 'rust-panic1' into rust-panic1-034
by teor＠torproject.org 19 Apr '19

19 Apr '19

commit 5ab5c8ec15de7a54c9196b9adcfda6042d4db5e4 Merge: 48e990359 fecd583c0 Author: teor <teor(a)torproject.org> Date: Mon Apr 15 10:15:02 2019 +1000 Merge branch 'rust-panic1' into rust-panic1-034 changes/bug27199 | 3 +++ src/rust/Cargo.toml | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --cc src/rust/Cargo.toml index c3e44d2a7,c22eea984..de8693ea3 --- a/src/rust/Cargo.toml +++ b/src/rust/Cargo.toml @@@ -1,15 -1,11 +1,20 @@@ [workspace] -members = ["tor_util", "… [View More]

1 0

[tor/release-0.3.4] relays shouldn't close idle rend circuits
by teor＠torproject.org 19 Apr '19

19 Apr '19

commit add0f89c14b4aab6726e11acdcd864ee0c91543b Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Mar 9 02:55:28 2019 -0500 relays shouldn't close idle rend circuits Allow connections to single onion services to remain idle without being disconnected. Relays acting as rendezvous points for single onion services were mistakenly closing idle established rendezvous circuits after 60 seconds, thinking that they are unused directory-fetching … [View More]

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by teor＠torproject.org 19 Apr '19

19 Apr '19

commit a0823d20eb94075ae75be3dbd9527f9ed1fdd0cf Merge: ca0089066 2460b4461 Author: teor <teor(a)torproject.org> Date: Fri Apr 19 11:56:25 2019 +1000 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug23790 | 6 ++++++ changes/bug29665 | 7 +++++++ src/or/circuituse.c | 5 ++++- src/or/rendservice.c | 27 +++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.4] hs-v2: Copy needed information between service on prunning
by teor＠torproject.org 19 Apr '19

19 Apr '19

commit b4e44a371f077f5a9fca19f94e6ff5f604f3e9d3 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Mar 8 09:54:54 2019 -0500 hs-v2: Copy needed information between service on prunning Turns out that when reloading a tor configured with hidden service(s), we weren't copying all the needed information between the old service object to the new one. For instance, the desc_is_dirty timestamp wasn't which could lead to the service uploading its … [View More]descriptor much later than it would need to. The replaycache wasn't also moved over and some intro point information as well. Fixes #23790 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug23790 | 6 ++++++ src/or/rendservice.c | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/changes/bug23790 b/changes/bug23790 new file mode 100644 index 000000000..4aaf616e4 --- /dev/null +++ b/changes/bug23790 @@ -0,0 +1,6 @@ + o Minor bugfixes (hidden service v2): + - When reloading tor (HUP) configured with hidden service(s), some + information weren't copy to the new service object. One problem with this + was that tor would wait at least the RendPostPeriod time before uploading + the descriptor if the reload happened before the descriptor needed to be + published. Fixes bug 23790; bugfix on 0.2.1.9-alpha. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index da200d138..32b856452 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -532,6 +532,30 @@ rend_service_check_dir_and_add(smartlist_t *service_list, } } +/* Copy relevant data from service src to dst while pruning the service lists. + * This should only be called during the pruning process which takes existing + * services and copy their data to the newly configured services. The src + * service replaycache will be set to NULL after this call. */ +static void +copy_service_on_prunning(rend_service_t *dst, rend_service_t *src) +{ + tor_assert(dst); + tor_assert(src); + + /* Keep the timestamps for when the content changed and the next upload + * time so we can properly upload the descriptor if needed for the new + * service object. */ + dst->desc_is_dirty = src->desc_is_dirty; + dst->next_upload_time = src->next_upload_time; + /* Move the replaycache to the new object. */ + dst->accepted_intro_dh_parts = src->accepted_intro_dh_parts; + src->accepted_intro_dh_parts = NULL; + /* Copy intro point information to destination service. */ + dst->intro_period_started = src->intro_period_started; + dst->n_intro_circuits_launched = src->n_intro_circuits_launched; + dst->n_intro_points_wanted = src->n_intro_points_wanted; +} + /** Set up rend_service_list, based on the values of HiddenServiceDir and * HiddenServicePort in <b>options</b>. Return 0 on success and -1 on * failure. (If <b>validate_only</b> is set, parse, warn and return as @@ -812,6 +836,9 @@ rend_config_services(const or_options_t *options, int validate_only) smartlist_add_all(new->expiring_nodes, old->expiring_nodes); smartlist_clear(old->expiring_nodes); smartlist_add(surviving_services, old); + + /* Copy service flags to the new service object. */ + copy_service_on_prunning(new, old); break; } } SMARTLIST_FOREACH_END(old); [View Less]

1 0

[tor/master] Merge branch 'maint-0.4.0'
by teor＠torproject.org 19 Apr '19

19 Apr '19

commit 4b8c77a590df699c56dcfd92e4e4839223f488dc Merge: bffba9d26 24b68b477 Author: teor <teor(a)torproject.org> Date: Fri Apr 19 12:00:59 2019 +1000 Merge branch 'maint-0.4.0'

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'tor-github/pr/792' into maint-0.2.9
by teor＠torproject.org 19 Apr '19

19 Apr '19

commit 2460b4461f61c3b0fdeedb5bbfb21847a256a867 Merge: ec213ae8a add0f89c1 Author: teor <teor(a)torproject.org> Date: Fri Apr 19 11:42:09 2019 +1000 Merge remote-tracking branch 'tor-github/pr/792' into maint-0.2.9 changes/bug29665 | 7 +++++++ src/or/circuituse.c | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.4
by teor＠torproject.org 19 Apr '19

19 Apr '19

commit cbce8dedd3703424111928d68dfe8920900ce054 Merge: 116970dda 2460b4461 Author: teor <teor(a)torproject.org> Date: Fri Apr 19 11:59:18 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.4 "ours" merge, to avoid taking any changes from PR 792 in 0.3.4. (We already merged PR 791 for 29665 into 0.3.4.)

1 0