Merge remote-tracking branch 'origin/patches-2.0'

diff --cc win32select.c
index 68f7697a72572eb3e74e777331c58ae236a447bb,1743b01ed226438d2dfdc1f80d66d3a18d6844e2..a50a2df7b4e7bf5a9c95b1e62bf853f2fc80d606
--- 1/win32select.c
--- 2/win32select.c
+++ b/win32select.c
@@@ -381,8 -372,6 +381,8 @@@ win32_dealloc(struct event_base *base
                mm_free(win32op->exset_out);
        /* XXXXX free the tree. */
  
-       memset(win32op, 0, sizeof(win32op));
+       memset(win32op, 0, sizeof(*win32op));
        mm_free(win32op);
  }
 +
 +#endif