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

[tor/maint-0.2.9] Merge remote-tracking branch 'tor-github/pr/1209' into combined31343_31374_029
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit 7667c1cbaffeb4c1df9241d80d84d27f3f9bde18 Merge: 8d22c09ab 878f44090 Author: teor <teor(a)torproject.org> Date: Fri Aug 9 09:48:28 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1209' into combined31343_31374_029 changes/bug31343 | 9 +++++++++ src/or/channeltls.c | 23 +++++++++++++++++++---- src/or/routerlist.c | 7 ++++--- 3 files changed, 32 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.2.9] Merge remote-tracking branch 'tor-github/pr/1221' into combined31343_31374_029
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit 2bc8989d833c3b583395380031e9b730d1c3fb37 Merge: 7667c1cba 3a280b35e Author: teor <teor(a)torproject.org> Date: Fri Aug 9 09:48:41 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1221' into combined31343_31374_029 changes/ticket31374 | 4 ++++ src/common/compat_time.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1221' into combined31343_31374_029
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit 2bc8989d833c3b583395380031e9b730d1c3fb37 Merge: 7667c1cba 3a280b35e Author: teor <teor(a)torproject.org> Date: Fri Aug 9 09:48:41 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1221' into combined31343_31374_029 changes/ticket31374 | 4 ++++ src/common/compat_time.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1210' into combined31343_31374_035
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit 4665ac9ec70105f490ebd810e58281e0c8f03926 Merge: e83eabc9b a4400a77a Author: teor <teor(a)torproject.org> Date: Fri Aug 9 09:49:27 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1210' into combined31343_31374_035 changes/bug31343 | 9 +++++++++ src/core/or/channeltls.c | 24 ++++++++++++++++++++---- src/feature/nodelist/routerlist.c | 6 ++++-- 3 files changed, 33 insertions(+), 6 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1211' into test31343_040
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit e609f003425ee9dff9bebbf4f5c683b8395a5c89 Merge: 0a661cde1 7e32db478 Author: teor <teor(a)torproject.org> Date: Fri Aug 9 09:50:50 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1211' into test31343_040 changes/bug31343 | 9 +++++++++ src/core/or/channeltls.c | 20 ++++++++++++++++---- src/feature/nodelist/routerlist.c | 6 ++++-- 3 files changed, 29 insertions(+), 6 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1222' into combined31343_31374_035
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit 65343a966e48e6eb49873f3cdb9a9f68bf72c70c Merge: 4665ac9ec b560d94ac Author: teor <teor(a)torproject.org> Date: Fri Aug 9 09:49:35 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1222' into combined31343_31374_035 changes/ticket31374 | 4 ++++ src/lib/time/compat_time.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1209' into combined31343_31374_029
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit 7667c1cbaffeb4c1df9241d80d84d27f3f9bde18 Merge: 8d22c09ab 878f44090 Author: teor <teor(a)torproject.org> Date: Fri Aug 9 09:48:28 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1209' into combined31343_31374_029 changes/bug31343 | 9 +++++++++ src/or/channeltls.c | 23 +++++++++++++++++++---- src/or/routerlist.c | 7 ++++--- 3 files changed, 32 insertions(+), 7 deletions(-)

1 0

[tor/master] Merge branch 'bug31343_31374_041' into bug31343_31374_master
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit 126d8681e11f10de87e62ba4dcc676735491a975 Merge: 0e1fd6d61 fb19d13f2 Author: teor <teor(a)torproject.org> Date: Fri Aug 9 09:51:50 2019 +1000 Merge branch 'bug31343_31374_041' into bug31343_31374_master

1 0

[tor/master] Merge branch 'bug31343_31374_040' into bug31343_31374_041
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit fb19d13f24306166c1dc078caeea2a5155638ac0 Merge: 53d5b67f0 7502881de Author: teor <teor(a)torproject.org> Date: Fri Aug 9 09:51:44 2019 +1000 Merge branch 'bug31343_31374_040' into bug31343_31374_041

1 0

[tor/master] Merge branch 'bug31343_31374_035' into bug31343_31374_040
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit 7502881deb0ba702d2a6a2ea3d4d24cd998e8616 Merge: e609f0034 d4184fca3 Author: teor <teor(a)torproject.org> Date: Fri Aug 9 09:51:40 2019 +1000 Merge branch 'bug31343_31374_035' into bug31343_31374_040 changes/ticket31374 | 4 ++++ src/lib/time/compat_time.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc src/lib/time/compat_time.c index c6625c780,98854bad2..a047d6c2c --- a/src/lib/time/compat_time.c +++ b/src/lib/time/compat_time.c @@@ -519,12 -519,10 +519,12 @@@ monotime_init_internal(void HANDLE h = load_windows_system_library(TEXT("kernel32.dll")); if (h) { - GetTickCount64_fn = (GetTickCount64_fn_t) + GetTickCount64_fn = (GetTickCount64_fn_t) (void(*)(void)) GetProcAddress(h, "GetTickCount64"); } - // FreeLibrary(h) ? + // We can't call FreeLibrary(h) here, because freeing the handle may + // unload the library, and cause future calls to GetTickCount64_fn() + // to fail. See 29642 for details. } void

1 0