]> granicus.if.org Git - libevent/commit
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2011 18:38:21 +0000 (14:38 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2011 18:38:21 +0000 (14:38 -0400)
commit21be3dff746f5cc86b9d0aa22b32c9f3d5a6d480
treecdefc31a2ff9e75aaa55908d2f7bd4d583bfe52b
parent1fb5cc682964f911ae5c7a563da9fccc4b5375c6
parent341e1b03a83f1d60197549fd5e793db94f81cf61
Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
include/event2/buffer.h
include/event2/thread.h
include/event2/util.h
event.h
include/event2/buffer.h
include/event2/dns.h
include/event2/dns_compat.h
include/event2/http.h
include/event2/thread.h
include/event2/util.h