]> granicus.if.org Git - libevent/commit
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Thu, 6 Oct 2011 19:21:55 +0000 (15:21 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 6 Oct 2011 19:21:55 +0000 (15:21 -0400)
commit83588777682b2a7d9044f527dc4acbec70775fa9
tree2af8bf94b6b63037c43960817569a6b5475e2e21
parent5760efb1b67414e65e42ee7127286a7d9a7bd3a7
parent706aa5f416a65107a3b40511ea91cff5ed048024
Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
buffer.c
test/regress_buffer.c
buffer.c
bufferevent_sock.c
evbuffer-internal.h
include/event2/buffer.h
test/regress_buffer.c