Merge branch 'maint-0.4.3'

Amazingly, this time we had no merge conflicts with "falls through" comments.

diff --cc src/core/or/channeltls.c
Simple merge

diff --cc src/core/or/circuitbuild.c
Simple merge

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

diff --cc src/core/or/circuituse.c
Simple merge

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

diff --cc src/core/or/onion.c
Simple merge

diff --cc src/core/or/policies.c
Simple merge

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

diff --cc src/core/or/scheduler.c
Simple merge

diff --cc src/core/proto/proto_socks.c
Simple merge

diff --cc src/feature/client/entrynodes.c
Simple merge

diff --cc src/feature/control/control_cmd.c
Simple merge

diff --cc src/feature/dirclient/dirclient.c
Simple merge

diff --cc src/feature/relay/dns.c
Simple merge