From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 1 Nov 2013 18:21:54 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.4-alpha~76
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a60632a1ec6649dfa0be175d064b1ca6192cc5bf;p=libevent

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

a60632a1ec6649dfa0be175d064b1ca6192cc5bf
diff --cc event_iocp.c
index c69946c4,9648366d..a9902fbc
--- a/event_iocp.c
+++ b/event_iocp.c
@@@ -159,10 -162,9 +163,9 @@@ init_extension_functions(struct win32_e
  }
  
  static struct win32_extension_fns the_extension_fns;
- static int extension_fns_initialized = 0;
  
  const struct win32_extension_fns *
 -event_get_win32_extension_fns(void)
 +event_get_win32_extension_fns_(void)
  {
  	return &the_extension_fns;
  }