]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Tue, 25 Oct 2011 15:43:01 +0000 (11:43 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 25 Oct 2011 15:43:01 +0000 (11:43 -0400)
1  2 
include/event2/http.h

Simple merge