Merge remote-tracking branch 'origin/patches-2.0'

diff --cc event-internal.h
Simple merge

diff --cc event.c
Simple merge

diff --cc evthread-internal.h
Simple merge

diff --cc evthread.c
Simple merge

diff --cc evutil_rand.c
Simple merge

diff --cc signal.c
Simple merge