[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

[nickm at torproject.org]

commit cde5c9d0c335e51c254251f018e9de620c27d9db
Merge: b858f576c a5d4ce2b3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 22 13:35:33 2018 -0400

    Merge branch 'maint-0.3.3'

 src/or/protover_rust.c   | 17 ++++++++++++++++-
 src/rust/protover/ffi.rs | 26 ++++++++++++++++++++++++++
 src/test/test_protover.c |  2 ++
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --cc src/test/test_protover.c
index 1b0adb175,0948cd564..70b7c9a85
--- a/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_();