August 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.4] Keep descriptor rotation time after HUP occurs.
by nickm＠torproject.org 16 Aug '18

16 Aug '18

commit c798957b5925b637896bf162f58aca806235c2a5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Jul 28 17:31:46 2018 +0200 Keep descriptor rotation time after HUP occurs. --- changes/bug26932 | 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug26932 b/changes/bug26932 new file mode 100644 index 000000000..7d9481dcd --- /dev/null +++ b/changes/bug26932 @@ -0,0 +1,3 @@ + o Minor bugfixes (onion services): + - Fix bug that causes services to not ever rotate their descriptors if they + were getting SIGHUPed often. Fixes bug 26932; bugfix on 0.3.2.1-alpha. \ No newline at end of file diff --git a/src/or/hs_service.c b/src/or/hs_service.c index b9a1dfc36..33088480d 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -845,6 +845,7 @@ move_hs_state(hs_service_t *src_service, hs_service_t *dst_service) replaycache_free(dst->replay_cache_rend_cookie); } dst->replay_cache_rend_cookie = src->replay_cache_rend_cookie; + dst->next_rotation_time = src->next_rotation_time; src->replay_cache_rend_cookie = NULL; /* steal pointer reference */ }

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 16 Aug '18

16 Aug '18

commit b49355915bf063448cf338fbb76061b601e5e333 Merge: 2deee972a 936e2aa0d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 16 08:37:11 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26932 | 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 16 Aug '18

16 Aug '18

commit 1533e0c3503e277bafaaf9a7331fd653809e74c9 Merge: d78f25c07 b49355915 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 16 08:37:11 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug26932 | 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 16 Aug '18

16 Aug '18

commit 936e2aa0de6edb0578e18ad0760a67ad64a448d4 Merge: 4847e2216 c798957b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 16 08:37:11 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26932 | 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+)

1 0

[tor/maint-0.3.4] Rust: Say that we support rust stable in GettingStartedRust.md
by nickm＠torproject.org 16 Aug '18

16 Aug '18

commit db3414dd518d757e9a1c9be6c7987fee54f51cf7 Author: teor <teor(a)torproject.org> Date: Thu Aug 16 18:58:47 2018 +1000 Rust: Say that we support rust stable in GettingStartedRust.md In 24765, we said that we supported rust stable in CodingStandardsRust.md. But we left GettingStartedRust.md saying that we support rust nightly. Closes 27160. --- doc/HACKING/GettingStartedRust.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/HACKING/GettingStartedRust.md b/doc/HACKING/GettingStartedRust.md index a5253b46a..920596cad 100644 --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@ -119,9 +119,10 @@ the module calls. Modules which call fewer other modules are better targets. Strive to change the C API as little as possible. -We are currently targetting Rust nightly, *for now*. We expect this to change -moving forward, as we understand more about which nightly features we need. It -is on our TODO list to try to cultivate good standing with various distro +We are currently targetting Rust stable. (See CodingStandardsRust.md for more +details.) + +It is on our TODO list to try to cultivate good standing with various distro maintainers of `rustc` and `cargo`, in order to ensure that whatever version we solidify on is readily available.

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 16 Aug '18

16 Aug '18

commit 4847e221689f702f74d6dd15181216aeabbb6785 Merge: 0fc171a47 db3414dd5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 16 08:35:27 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 doc/HACKING/GettingStartedRust.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --cc doc/HACKING/GettingStartedRust.md index a533ba8a2,920596cad..aa29c097d --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@@ -122,23 -119,13 +122,25 @@@ the module calls. Modules which call f Strive to change the C API as little as possible. - We are currently targeting Rust nightly, *for now*. We expect this to - change moving forward, as we understand more about which nightly - features we need. It is on our TODO list to try to cultivate good + We are currently targetting Rust stable. (See CodingStandardsRust.md for more + details.) + -It is on our TODO list to try to cultivate good standing with various distro -maintainers of `rustc` and `cargo`, in order to ensure that whatever version we -solidify on is readily available. ++It is on our TODO list to try to cultivate good +standing with various distro maintainers of `rustc` and `cargo`, in +order to ensure that whatever version we solidify on is readily +available. + +If parts of your Rust code needs to stay in sync with C code (such as +handling enums across the FFI boundary), annonotate these places in a +comment structured as follows: + + /// C_RUST_COUPLED: <path_to_file> `<name_of_c_object>` + +Where <name_of_c_object> can be an enum, struct, constant, etc. Then, +do the same in the C code, to note that rust will need to be changed +when the C does. + + Adding your Rust module to Tor's build system -----------------------------------------------

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 16 Aug '18

16 Aug '18

commit 4847e221689f702f74d6dd15181216aeabbb6785 Merge: 0fc171a47 db3414dd5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 16 08:35:27 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 doc/HACKING/GettingStartedRust.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --cc doc/HACKING/GettingStartedRust.md index a533ba8a2,920596cad..aa29c097d --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@@ -122,23 -119,13 +122,25 @@@ the module calls. Modules which call f Strive to change the C API as little as possible. - We are currently targeting Rust nightly, *for now*. We expect this to - change moving forward, as we understand more about which nightly - features we need. It is on our TODO list to try to cultivate good + We are currently targetting Rust stable. (See CodingStandardsRust.md for more + details.) + -It is on our TODO list to try to cultivate good standing with various distro -maintainers of `rustc` and `cargo`, in order to ensure that whatever version we -solidify on is readily available. ++It is on our TODO list to try to cultivate good +standing with various distro maintainers of `rustc` and `cargo`, in +order to ensure that whatever version we solidify on is readily +available. + +If parts of your Rust code needs to stay in sync with C code (such as +handling enums across the FFI boundary), annonotate these places in a +comment structured as follows: + + /// C_RUST_COUPLED: <path_to_file> `<name_of_c_object>` + +Where <name_of_c_object> can be an enum, struct, constant, etc. Then, +do the same in the C code, to note that rust will need to be changed +when the C does. + + Adding your Rust module to Tor's build system -----------------------------------------------

1 0

[tor/maint-0.3.2] Rust: Say that we support rust stable in GettingStartedRust.md
by nickm＠torproject.org 16 Aug '18

16 Aug '18

commit db3414dd518d757e9a1c9be6c7987fee54f51cf7 Author: teor <teor(a)torproject.org> Date: Thu Aug 16 18:58:47 2018 +1000 Rust: Say that we support rust stable in GettingStartedRust.md In 24765, we said that we supported rust stable in CodingStandardsRust.md. But we left GettingStartedRust.md saying that we support rust nightly. Closes 27160. --- doc/HACKING/GettingStartedRust.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/HACKING/GettingStartedRust.md b/doc/HACKING/GettingStartedRust.md index a5253b46a..920596cad 100644 --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@ -119,9 +119,10 @@ the module calls. Modules which call fewer other modules are better targets. Strive to change the C API as little as possible. -We are currently targetting Rust nightly, *for now*. We expect this to change -moving forward, as we understand more about which nightly features we need. It -is on our TODO list to try to cultivate good standing with various distro +We are currently targetting Rust stable. (See CodingStandardsRust.md for more +details.) + +It is on our TODO list to try to cultivate good standing with various distro maintainers of `rustc` and `cargo`, in order to ensure that whatever version we solidify on is readily available.

1 0

[tor/maint-0.3.3] Rust: Say that we support rust stable in GettingStartedRust.md
by nickm＠torproject.org 16 Aug '18

16 Aug '18

commit db3414dd518d757e9a1c9be6c7987fee54f51cf7 Author: teor <teor(a)torproject.org> Date: Thu Aug 16 18:58:47 2018 +1000 Rust: Say that we support rust stable in GettingStartedRust.md In 24765, we said that we supported rust stable in CodingStandardsRust.md. But we left GettingStartedRust.md saying that we support rust nightly. Closes 27160. --- doc/HACKING/GettingStartedRust.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/HACKING/GettingStartedRust.md b/doc/HACKING/GettingStartedRust.md index a5253b46a..920596cad 100644 --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@ -119,9 +119,10 @@ the module calls. Modules which call fewer other modules are better targets. Strive to change the C API as little as possible. -We are currently targetting Rust nightly, *for now*. We expect this to change -moving forward, as we understand more about which nightly features we need. It -is on our TODO list to try to cultivate good standing with various distro +We are currently targetting Rust stable. (See CodingStandardsRust.md for more +details.) + +It is on our TODO list to try to cultivate good standing with various distro maintainers of `rustc` and `cargo`, in order to ensure that whatever version we solidify on is readily available.

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 16 Aug '18

16 Aug '18

commit 2deee972a37a8b36040f0f37091906b8dec61b25 Merge: 571cb2f66 4847e2216 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 16 08:35:31 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 doc/HACKING/GettingStartedRust.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

1 0