Merge branch 'maint-0.3.5'

changes/bug28938

src/app/config/config.c

src/core/or/connection_edge.c

src/ext/byteorder.h

src/ext/ed25519/donna/ed25519-donna-portable-identify.h

src/ext/trunnel/trunnel.c

src/lib/err/backtrace.c

src/lib/net/inaddr_st.h

src/test/test-memwipe.c

src/test/test_options.c