[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

[nickm at torproject.org]

commit e6a44012001afb2d4c5956e4b55ccf6b622fd79e
Merge: a891d81c5 09472791d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 9 08:52:10 2019 -0500

    Merge branch 'maint-0.3.5'

 changes/bug28938                                        | 4 ++++
 src/app/config/config.c                                 | 3 +++
 src/core/or/connection_edge.c                           | 3 +++
 src/ext/byteorder.h                                     | 4 ++++
 src/ext/ed25519/donna/ed25519-donna-portable-identify.h | 2 +-
 src/ext/trunnel/trunnel.c                               | 6 +++++-
 src/lib/err/backtrace.c                                 | 3 +++
 src/lib/net/inaddr_st.h                                 | 5 ++++-
 src/test/test-memwipe.c                                 | 4 ++++
 src/test/test_options.c                                 | 4 ++++
 10 files changed, 35 insertions(+), 3 deletions(-)