Merge remote-tracking branch 'origin/maint-0.2.4'

changes/bug2077_share_delete

@@ -1,7 +0,0 @@
-  o Major bugfixes (windows):
-    - Open files to be mapped with FILE_SHARE_DELETE so that we can
-      replace them before closing the mapping. This is a likely cause of
-      warnings and crashes when replacing the microdescriptor cache
-      file. Diagnosed based on comments by "doorss" and by Robert
-      Ransom. Possible fix for bug 2077; bugfix on 0.2.2.6-alpha.
-

src/common/compat.c

@@ -248,7 +248,7 @@ tor_mmap_file(const char *filename)
   strlcpy(tfilename,filename,MAX_PATH);
 #endif
   file_handle = CreateFile(tfilename,
-                           GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE,
+                           GENERIC_READ, FILE_SHARE_READ,
                            NULL,
                            OPEN_EXISTING,
                            FILE_ATTRIBUTE_NORMAL,