]> granicus.if.org Git - libevent/commit
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Fri, 29 Aug 2014 18:32:10 +0000 (14:32 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 29 Aug 2014 18:32:10 +0000 (14:32 -0400)
commit8bf769c47af11b484295c9e7189f756aa106c64e
treea2501a8507e31e9ff27f7c3a78a5c3fde550b64b
parentf691389e82699033a3973d1b2c298b0c820b3b64
parent6466e88ac1dac48eaa9435ce9a45d6496eed7abb
Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
sample/http-server.c
sample/http-server.c