Merge branch 'maint-0.4.2' into maint-0.4.3

diff --cc configure.ac
Simple merge

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

diff --cc src/feature/dirauth/keypin.c
Simple merge

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

diff --cc src/lib/cc/compat_compiler.h
Simple merge

diff --cc src/lib/crypt_ops/crypto_digest_nss.c
Simple merge

diff --cc src/lib/net/address.c
Simple merge