]> granicus.if.org Git - libevent/commit
Merge remote-tracking branch 'fancycode/buffer_references'
authorNick Mathewson <nickm@torproject.org>
Thu, 8 Dec 2011 19:04:04 +0000 (14:04 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 8 Dec 2011 19:04:04 +0000 (14:04 -0500)
commitde5428e7d50338ffa9f54fdb93283b28cea57f87
tree9a60cae21597a6b32559ea21dd3bad5fb447e912
parentd430602863ad9ddb911fe52c58ddc842b75ccdb3
parenta8e5e2fce4a20bd1e324ecb80540870e19add846
Merge remote-tracking branch 'fancycode/buffer_references'

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