commit c76907b54d2e49d4771aa079683ad75cd763b24d Merge: ece35992a cec42be57 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 17 18:56:52 2019 -0400

Merge branch 'maint-0.4.1' into release-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(-)