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

[dgoulet@xxxxxxxxxxxxxx]

commit 4af6e3b4dccf22d6d34b744f5f90c5218a9de6c4
Merge: fd3e0c561 636cf9763
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date:   Wed Jun 24 13:49:03 2020 -0400

    Merge branch 'tor-github/pr/1947'

 src/feature/control/control_getinfo.c |  4 ++--
 src/feature/relay/relay_periodic.c    |  6 +++---
 src/feature/relay/router.c            |  2 +-
 src/feature/relay/selftest.c          | 12 ++++++------
 src/feature/relay/selftest.h          | 10 +++++-----
 src/feature/stats/predict_ports.c     |  2 +-
 6 files changed, 18 insertions(+), 18 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits