[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0

[nickm at torproject.org]

commit 7b348e2efd0ef702554ce1e44cec958d8dd25dd2
Merge: b17e3f6a3 34bab120d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 17 18:56:52 2019 -0400

    Merge branch 'maint-0.4.0' into release-0.4.0

 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(-)