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

[nickm at torproject.org]

commit 03c3fa456ddd6cc5c0767a962a7908bace5948e3
Merge: b485554d5 97f7efa9e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 17 18:56:51 2019 -0400

    Merge branch 'maint-0.3.5' into release-0.3.5

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