Merge branch 'ewma'

diff --cc ChangeLog
Simple merge

diff --cc doc/tor.1.in
Simple merge

diff --cc src/or/circuitlist.c
Simple merge

diff --cc src/or/config.c
Simple merge

diff --cc src/or/connection.c
Simple merge

diff --cc src/or/dns.c
Simple merge

diff --cc src/or/networkstatus.c
Simple merge

diff --cc src/or/or.h
Simple merge