[tor-commits] [tor/master] Merge branch 'ticket31374_035' into maint-0.4.1

[nickm at torproject.org]

commit 53d5b67f07446f5f4100db032cd47281e0cfd7b1
Merge: 0bc5b7ae9 b560d94ac
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 8 15:24:52 2019 -0400

    Merge branch 'ticket31374_035' into maint-0.4.1

 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 7136eaba6,98854bad2..3f41500f3
--- a/src/lib/time/compat_time.c
+++ b/src/lib/time/compat_time.c
@@@ -527,12 -519,10 +527,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