Merge branch 'master' of https://git.torproject.org/tor into bug13111-empty-key-files...

Conflicts:
  src/or/connection_edge.c
Merged in favour of origin.

diff --cc src/common/compat.c
Simple merge

diff --cc src/common/util.c
Simple merge

diff --cc src/common/util.h
Simple merge

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

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

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

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

diff --cc src/test/include.am
Simple merge