commit 55b8eedba8902610fa594b14715e4cdd3d2e925d Merge: 58b23b33e4 dd63b97288 Author: Alexander Færøy ahf@torproject.org Date: Wed Oct 28 15:17:51 2020 +0000

Merge branch 'maint-0.3.5' into release-0.3.5

changes/ticket40133 | 5 ++ src/core/or/protover.c | 4 +- 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 | 91 +++++++++---------------------------- 7 files changed, 66 insertions(+), 126 deletions(-)