commit 0327f9a0757e202666ec54460a69303633af4b33
Merge: 896a1ac50 97f7efa9e
Author: Nick Mathewson <ni...@torproject.org>
Date: Thu Sep 12 09:51:04 2019 -0400
Merge branch 'ticket31687_035' into ticket31687_040
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(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
