commit 5591a3bcd6f80ab301e8750930de1c7bca78387c Merge: ecffdb0b17 a86918d524 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Dec 16 12:36:35 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/504' src/ext/ed25519/donna/test-ticks.h | 4 ++-- src/feature/client/entrynodes.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)