commit 2eae59e475168c3056cd33d6ead4f384be915ec7 Merge: 279225acd 1bd0494f8 Author: George Kadianakis desnacked@riseup.net Date: Wed Jun 24 17:22:53 2020 +0300

Merge branch 'tor-github/pr/1939'

changes/ticket34232 | 5 +++++ src/core/or/versions.c | 8 ++++---- src/test/test_protover.c | 4 ---- 3 files changed, 9 insertions(+), 8 deletions(-)