commit cec42be570fcbbfbc5971e0ceba21e8eadd32d21 Merge: ab74c3560 34bab120d Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 17 18:56:52 2019 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

changes/ticket31687_1 | 4 ++++ changes/ticket31687_2 | 5 +++++ src/core/or/connection_edge.c | 7 +++++-- src/lib/math/fp.c | 17 ++++++++--------- 4 files changed, 22 insertions(+), 11 deletions(-)