Merge branch '20_uri_nonconformant' into patches-2.0

diff --cc http.c
Simple merge

diff --cc include/event2/http.h
Simple merge