Merge branch 'maint-0.2.9' into maint-0.3.0

diff --cc src/ext/csiphash.c
Simple merge

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

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

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

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