]> granicus.if.org Git - libevent/commit
Merge remote branch 'chrisd/iocp-fixes4'
authorNick Mathewson <nickm@torproject.org>
Wed, 8 Sep 2010 18:12:12 +0000 (14:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 8 Sep 2010 18:12:12 +0000 (14:12 -0400)
commit3658b1696df8784b156cc6643a36f7cfa69e0213
tree31c111e2f9f7a6e3b6aef0952f4b23e57d21b5d2
parent9580e282d7e5801802e935956902a1948525d474
parent17a14f1af2ace0201baa1b5bbba031296e62d879
Merge remote branch 'chrisd/iocp-fixes4'

Conflicts:
test/regress_thread.c
event-internal.h
event.c
test/regress_thread.c