From: Alexander Færøy <ahf@torproject.org>
Date: Wed, 28 Oct 2020 15:39:37 +0000 (+0000)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.3
X-Git-Tag: tor-0.4.3.7~4^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4876409c2aa7deecd5f57474ee6de6ea9e90a855;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5' into maint-0.4.3
---

4876409c2aa7deecd5f57474ee6de6ea9e90a855
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);