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

[tor/maint-0.3.4] Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit 038bc21f8894043fbdda0cc87adddfbad84f65c4 Merge: 8013e3e8b 80ad15921 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 09:33:36 2018 -0400 Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3 changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-)

1 0

[tor/maint-0.3.4] Remove extraneous argument from Rust protover_compute_vote()
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit 80ad15921cef42ac12da356584f217d2ead5cb09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 17 11:50:46 2018 -0400 Remove extraneous argument from Rust protover_compute_vote() This argument was added to match an older idea for the C api, but we decided not to do it that way in C. Fixes bug 27741; bugfix on 0.3.3.6 / TROVE-2018-005 fix. --- changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 13 ++++--------- 2 files changed, 9 … [View More]

1 0

[tor/maint-0.3.3] Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit 038bc21f8894043fbdda0cc87adddfbad84f65c4 Merge: 8013e3e8b 80ad15921 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 09:33:36 2018 -0400 Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3 changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-)

1 0

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

30 Oct '18

commit cf2cb783b77bf9a84c6485b492ebb7e09914b74f Merge: c4b6b5738 038bc21f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 09:34:04 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-)

1 0

[tor/maint-0.3.5] Remove extraneous argument from Rust protover_compute_vote()
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit 80ad15921cef42ac12da356584f217d2ead5cb09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 17 11:50:46 2018 -0400 Remove extraneous argument from Rust protover_compute_vote() This argument was added to match an older idea for the C api, but we decided not to do it that way in C. Fixes bug 27741; bugfix on 0.3.3.6 / TROVE-2018-005 fix. --- changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 13 ++++--------- 2 files changed, 9 … [View More]

1 0

[tor/maint-0.3.5] Merge remote-tracking branch 'nickm/bug27741_033' into bug27741_035
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit 7bf9c93ab3af5be6f0881d4bc21fd8d72becff96 Merge: 1ae911660 80ad15921 Author: teor <teor(a)torproject.org> Date: Tue Sep 18 23:32:57 2018 +1000 Merge remote-tracking branch 'nickm/bug27741_033' into bug27741_035 Resolve conflicts due to rustfmt, and run rustfmt on the merged code. changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 19 ++++--------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --cc src/rust/protover/ffi.rs index … [View More]

1 0

[tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit 3a05b5acdc4a40eae6016ab94067bf5dde92e5fe Merge: 97324a731 cf2cb783b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 09:35:11 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5

1 0

[tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit 038bc21f8894043fbdda0cc87adddfbad84f65c4 Merge: 8013e3e8b 80ad15921 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 09:33:36 2018 -0400 Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3 changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-)

1 0

[tor/maint-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit cf2cb783b77bf9a84c6485b492ebb7e09914b74f Merge: c4b6b5738 038bc21f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 09:34:04 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'nickm/bug27741_033' into bug27741_035
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit 7bf9c93ab3af5be6f0881d4bc21fd8d72becff96 Merge: 1ae911660 80ad15921 Author: teor <teor(a)torproject.org> Date: Tue Sep 18 23:32:57 2018 +1000 Merge remote-tracking branch 'nickm/bug27741_033' into bug27741_035 Resolve conflicts due to rustfmt, and run rustfmt on the merged code. changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 19 ++++--------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --cc src/rust/protover/ffi.rs index … [View More]

1 0