Merge branch 'maint-0.3.5' into maint-0.4.3

diff --cc src/core/or/protover.c
Simple merge

diff --cc src/rust/protover/protover.rs
Simple merge

diff --cc src/test/test_protover.c
index f1d1ef0d4af3575faafa64fe0606cc05a2ebf2e1,b4689045cf0459064a9ae8511d6ca8461ef75dd4..7341631cccff93ecd84aa601cc1805cbb9d9bca3
--- 1/src/test/test_protover.c
--- 2/src/test/test_protover.c
+++ b/src/test/test_protover.c
@@@ -22,10 -22,10 +22,10 @@@ test_protover_parse(void *arg
    tt_skip();
   done:
    ;
 -#else
 +#else /* !defined(HAVE_RUST) */
    char *re_encoded = NULL;
  
-   const char *orig = "Foo=1,3 Bar=3 Baz= Quux=9-12,14,15-16,900";
+   const char *orig = "Foo=1,3 Bar=3 Baz= Quux=9-12,14,15-16";
    smartlist_t *elts = parse_protocol_list(orig);
  
    tt_assert(elts);