Nick Mathewson 0e207f9acb 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).		2012-05-31 12:38:11 -04:00
..
common	Merge remote-tracking branch 'public/close_file_mapping'	2012-05-31 12:38:11 -04:00
config	Merge remote-tracking branch 'origin/maint-0.2.2'	2012-05-15 10:01:12 -04:00
or	Merge remote-tracking branch 'public/bug1938'	2012-05-31 12:24:02 -04:00
test	Fix the unittest breakage introduced by a8a862c.	2012-05-18 20:52:24 +03:00
tools	Fix some remaining nmake/msvc build issues	2012-05-16 10:08:24 -04:00
win32	We do not need to define _WIN32 by hand; MSVC does that for us	2012-05-14 12:22:51 -04:00
Makefile.am	Move testing code into new src/test directory.	2009-09-23 00:24:43 -04:00