]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Tue, 22 Jan 2013 17:10:07 +0000 (17:10 +0000)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 Jan 2013 17:10:07 +0000 (17:10 +0000)
1  2 
sample/http-server.c

Simple merge