[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3
commit 4876409c2aa7deecd5f57474ee6de6ea9e90a855
Merge: 8e7778ec8a dd63b97288
Author: Alexander Færøy <ahf@xxxxxxxxxxxxxx>
Date: Wed Oct 28 15:39:37 2020 +0000
Merge branch 'maint-0.3.5' into maint-0.4.3
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(-)
diff --cc src/test/test_protover.c
index f1d1ef0d4a,b4689045cf..7341631ccc
--- a/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);
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits