[tor-commits] [tor/master] Merge branch 'tor-github/pr/1323'

[asn at torproject.org]

commit 585eaa123f21c4fed85865b938aeafac47730fec
Merge: a28a682a1 34bab120d
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Sep 17 14:51:43 2019 +0300

    Merge branch 'tor-github/pr/1323'

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