[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1860/head'

[nickm at torproject.org]

commit 77e65076ab8e8a19beb5e5bf3d4c90b6dc6f577b
Merge: f5c34d340 a63851478
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 14 11:52:00 2020 -0400

    Merge remote-tracking branch 'tor-github/pr/1860/head'

 src/feature/relay/router.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)