Merge branch '024_msvc_squashed'

Conflicts:
	src/or/or.h
	 srcwin32/orconfig.h

changes/7304

@@ -0,0 +1,7 @@
+  o Minor bugfixes:
+    - Replace all calls to snprintf outside of src/ext with tor_snprintf.
+      Fix for bug 7304.
+  o Code simplification and refactoring:
+    - Remove the #define to replace snprintf with _snprintf on windows;
+      they have different semantics, and all of our callers should be
+      using tor_snprintf anyway. Partial fix for bug 7304.

changes/build_with_msvc

@@ -0,0 +1,4 @@
+  o Features (portability):
+    - Build correctly with MSVC and Makefile.nmake. This resolves
+      numerous bugs and fixes reported by ultramage, including 7305,
+      7308, 7309, 7310, 7312, 7313, 7315, 7316, and 7669.