]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'ticket31687_035' into ticket31687_040
authorNick Mathewson <nickm@torproject.org>
Thu, 12 Sep 2019 13:51:04 +0000 (09:51 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 12 Sep 2019 13:51:04 +0000 (09:51 -0400)
1  2 
src/core/or/connection_edge.c
src/lib/math/fp.c

Simple merge
Simple merge