]> granicus.if.org Git - libevent/commit
Merge branch 'ratelimit'
authorNick Mathewson <nickm@torproject.org>
Wed, 6 Jan 2010 22:59:44 +0000 (17:59 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 6 Jan 2010 22:59:44 +0000 (17:59 -0500)
commitba2945f9314fa2f81afe09284d21724d2b5dc31d
tree43cf9d8bae2e8463cd3ec1bdbc9870646aad1a43
parent0546ce11e88c6c8b20c3ac85cb05fb0155e73a59
parent165d30e31a167215c03a9104423f2767c9ff9c9a
Merge branch 'ratelimit'

Conflicts:
bufferevent_async.c
bufferevent.c
bufferevent_async.c
bufferevent_openssl.c
bufferevent_sock.c
evutil.c
include/event2/util.h