[tor-commits] [tor/master] Merge branch 'bug31343_31374_035' into bug31343_31374_040

[teor at torproject.org]

commit 7502881deb0ba702d2a6a2ea3d4d24cd998e8616
Merge: e609f0034 d4184fca3
Author: teor <teor at 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