]> granicus.if.org Git - libevent/commit
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Mon, 14 Nov 2011 16:45:17 +0000 (11:45 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 14 Nov 2011 16:45:17 +0000 (11:45 -0500)
commit9ae6e5959d1c30d6043d4bb20f4d8741aec30a46
treef11800659a938a1e592e3379645b97f4f2434d71
parent54142c9458f77daedb0908a10afdc3a588ac99f6
parenta3f320e83d97dbd58afa883d8a1e2cf3cdc1ac39
Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
sample/dns-example.c
sample/dns-example.c