commit 7ce8548c288883abbd853463cd8a0fd8172f04c4 Merge: f9e526629 09472791d Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 9 08:52:10 2019 -0500
Merge branch 'maint-0.3.5' into release-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(-)