Merge branch 'maint-0.3.3'

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

diff --cc src/test/test_protover.c
index 1b0adb17571d568ac0757e67b2fba4aa1194a45b,0948cd56409f124371d2e90f30740f3c551f3c30..70b7c9a85fbf28623a29f7bb972aed325f49d5c0
--- 1/src/test/test_protover.c
--- 2/src/test/test_protover.c
+++ b/src/test/test_protover.c
@@@ -317,13 -317,15 +317,15 @@@ test_protover_all_supported(void *arg
    tor_end_capture_bugs_();
  
    /* Protocol name too long */
+ #ifndef HAVE_RUST // XXXXXX ?????
    tor_capture_bugs_(1);
    tt_assert(protover_all_supported(
 -                               "DoSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
 -                               "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
 -                               "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
 -                               "aaaaaaaaaaaa=1-65536", &msg));
 +                 "DoSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
 +                 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
 +                 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
 +                 "aaaaaaaaaaaa=1-65536", &msg));
    tor_end_capture_bugs_();
+ #endif
  
   done:
    tor_end_capture_bugs_();