commit c37d05d0c6937c61305239694915561199be85d0 Merge: 2edda444da 33fb51a111 Author: Alexander Færøy ahf@torproject.org Date: Wed Oct 28 15:15:39 2020 +0000

Merge remote-tracking branch 'tor-gitlab/mr/171'

changes/ticket40133 | 5 + changes/ticket40133_more | 3 + src/core/or/protover.c | 554 +++++++++++------------------------- src/core/or/protover.h | 12 +- src/rust/protover/errors.rs | 2 +- src/rust/protover/protoset.rs | 20 +- src/rust/protover/protover.rs | 10 +- src/rust/protover/tests/protover.rs | 60 ++-- src/test/test_protover.c | 127 ++------- 9 files changed, 246 insertions(+), 547 deletions(-)