summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-05-31 12:38:11 -0400
committerNick Mathewson <nickm@torproject.org>2012-05-31 12:38:11 -0400
commit0e207f9acb655d037c8aef86ea2781d8e1b4b570 (patch)
treebd5a76c50efb48bcdab5fd98994aa40a9c70c97c /changes
parentf1aae1236fc68a0047ac9370bdcf828a42efdab3 (diff)
parent2e58882b90a5015554b59862869b20dba39a5d58 (diff)
downloadtor-0e207f9acb655d037c8aef86ea2781d8e1b4b570.tar.gz
tor-0e207f9acb655d037c8aef86ea2781d8e1b4b570.zip
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).
Diffstat (limited to 'changes')
-rw-r--r--changes/close_file_handle4
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/close_file_handle b/changes/close_file_handle
new file mode 100644
index 0000000000..128ef81987
--- /dev/null
+++ b/changes/close_file_handle
@@ -0,0 +1,4 @@
+ o Minor bugfixes:
+ - Don't hold a windows file handle open for every file mapping;
+ the file mapping handle is sufficient. Fix for bug 5951; bugfix on
+ 0.1.2.1-alpha.