Merge remote-tracking branch 'public/close_file_mapping'

Conflicts:
	src/common/compat.h

Conflict was between replacement of MS_WINDOWS with _WIN32 in
master, and with removal of file_handle from tor_mmap_t struct in
close_file_mapping branch (for bug 5951 fix).

diff --cc src/common/compat.c
Simple merge

diff --cc src/common/compat.h
index 7edd889ee3aa0c216bf69040eb4ca80ed0b05fe7,06aeeb1967cc8e98eb8a0d2a98695d22a9b1a35d..7ba350945ae74f4c2e8413cb5b470c622f988804
--- 1/src/common/compat.h
--- 2/src/common/compat.h
+++ b/src/common/compat.h
@@@ -246,8 -248,7 +246,7 @@@ typedef struct tor_mmap_t 
  #ifdef HAVE_SYS_MMAN_H
    size_t mapping_size; /**< Size of the actual mapping. (This is this file
                          * size, rounded up to the nearest page.) */
 -#elif defined MS_WINDOWS
 +#elif defined _WIN32
-   HANDLE file_handle;
    HANDLE mmap_handle;
  #endif