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

[nickm]

commit bc8636e89af7a49dfdbb4fd25500ef33fceb04d0
Merge: 4c094436c 6fed66d26
Author: David Goulet 
Date:   Tue Jul 3 13:31:10 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 2cadd93cea374664f151e945549b95f0b1f49b00
Merge: 75b95e1c8 5b04392c1
Author: Nick Mathewson 
Date:   Fri Sep 21 09:35:51 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27316 |  3 +++
 src/or/protover.c| 17 -
 src/test/test_protover.c |  4 
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --cc src/or/protover.c
index 5145881ba,ebaca07ba..a63c2eb02
--- a/src/or/protover.c
+++ b/src/or/protover.c
@@@ -203,15 -206,10 +214,20 @@@ parse_single_entry(const char *s, cons
if (equals == s)
  goto error;
  
 +  /* The name must not be longer than MAX_PROTOCOL_NAME_LENGTH. */
 +  if (equals - s > (int)MAX_PROTOCOL_NAME_LENGTH) {
 +log_warn(LD_NET, "When parsing a protocol entry, I got a very large "
 + "protocol name. This is possibly an attack or a bug, unless "
 + "the Tor network truly supports protocol names larger than "
 + "%ud characters. The offending string was: %s",
 + MAX_PROTOCOL_NAME_LENGTH, escaped(out->name));
 +goto error;
 +  }
++
+   /* The name must contain only alphanumeric characters and hyphens. */
+   if (!is_valid_keyword(s, equals-s))
+ goto error;
+ 
out->name = tor_strndup(s, equals-s);
  
tor_assert(equals < end_of_entry);
@@@ -919,5 -791,3 +935,4 @@@ protover_free_all(void
}
  }
  
 +#endif /* !defined(HAVE_RUST) */
- 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit a546e07600151be275e6134407c2bcb833a3dd97
Merge: 281854bab 0971b3ce4
Author: Nick Mathewson 
Date:   Fri Sep 14 12:56:30 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27335| 4 
 src/or/hs_service.c | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 8253428253109dabc35861cbaab23a44a22eb24d
Merge: 4fa46fca8 9697c2da4
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 1d8957129b51826b41f8f9efb7b13c4506222bf5
Merge: 8e714d2a0 5a8827a4c
Author: Nick Mathewson 
Date:   Tue Sep 11 13:09:21 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 8afc100cb5fab5dc6e94b1ca13b922c9a1a1fe80
Merge: 05f5f6500 3119cb506
Author: Nick Mathewson 
Date:   Tue Sep 11 12:04:56 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/geoip-2018-09-06 | 4 +
 src/config/geoip | 49324 +
 src/config/geoip6|  8574 
 3 files changed, 18629 insertions(+), 39273 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 8cfca28be28f36eec93195f8818ab7adc20426d1
Merge: cff7cb858 8408331b3
Author: Nick Mathewson 
Date:   Mon Sep 10 09:41:55 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

"ours" to avoid version bump.




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit cff7cb858b2dfaacb0138bbe4637a80b58147f6a
Merge: 43e400f34 36885f34f
Author: Nick Mathewson 
Date:   Fri Sep 7 15:12:09 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

"ours" to avoid bump




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 732ea9120c9db5d6368cba6f2b789aa4fca5db31
Merge: 056003d60 0366ae224
Author: Nick Mathewson 
Date:   Fri Sep 7 09:15:56 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27344| 4 
 configure.ac| 1 +
 src/common/tortls.c | 7 ++-
 3 files changed, 11 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 056003d602a2e6f5c2f417d176b68da50b921c32
Merge: df18cf0e8 987e12a58
Author: Nick Mathewson 
Date:   Fri Sep 7 08:46:45 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27461 | 5 +
 src/or/main.c| 8 
 2 files changed, 13 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 08d5fd39d85d4f7174b52ef5d53db001398481ea
Merge: a7e72f0c4 a08e6e711
Author: Nick Mathewson 
Date:   Fri Sep 7 08:42:19 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27465 | 5 +
 src/common/address.c | 5 -
 2 files changed, 9 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit df18cf0e8fa9195df82bef9535f920ad913efab7
Merge: 08d5fd39d a5ed62f96
Author: Nick Mathewson 
Date:   Fri Sep 7 08:44:40 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27463| 3 +++
 src/or/rendclient.c | 9 +
 2 files changed, 12 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit a7e72f0c44f42145ff39c1ef77fb131c25569732
Merge: 67bdd144b 57b207efa
Author: Nick Mathewson 
Date:   Wed Sep 5 10:15:45 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 .travis.yml  | 2 +-
 changes/bug27418 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 67bdd144bd0bc3d6f063ae8b21c67e3f1cb1fbca
Merge: a28c14aad 2b1b8bf2c
Author: Nick Mathewson 
Date:   Wed Sep 5 09:56:19 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 .travis.yml  | 6 +++---
 changes/bug27453 | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit a28c14aad547fd1b254bdbf2acc1ff2b67551a96
Merge: 64c3c6a79 b40f9967f
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc Makefile.am
index 08cb8e3e7,34493765d..dcb445c97
--- a/Makefile.am
+++ b/Makefile.am
@@@ -118,19 -118,18 +118,20 @@@ test-network: need-chutney-path $(TESTI
  
  # Run all available tests using automake's test-driver
  # only run IPv6 tests if we can ping6 ::1 (localhost)
 +# only run IPv6 tests if we can ping ::1 (localhost)
  # some IPv6 tests will fail without an IPv6 DNS server (see #16971 and #17011)
  # only run mixed tests if we have a tor-stable binary
 -# Try both the BSD and the Linux ping6 syntax, because they're incompatible
 +# Try the syntax for BSD ping6, Linux ping6, and Linux ping -6,
 +# because they're incompatible
  test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
mkdir -p $(TEST_NETWORK_ALL_LOG_DIR)
+   rm -f $(TEST_NETWORK_ALL_LOG_DIR)/*.log 
$(TEST_NETWORK_ALL_LOG_DIR)/*.trs
@flavors="$(TEST_CHUTNEY_FLAVORS)"; \
 -  if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1; then \
 -  echo "ping6 ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
 +  if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1 || ping -6 -c 1 -W 1 ::1 >/dev/null 2>&1; then \
 +  echo "ping6 ::1 or ping ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
flavors="$$flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \
else \
 -  echo "ping6 ::1 failed, skipping IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
 +  echo "ping6 ::1 and ping ::1 failed, skipping IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
skip_flavors="$$skip_flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \
fi; \
if command -v tor-stable >/dev/null 2>&1; then \



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 64c3c6a790278f82b0d3fef7fa1ac675c9733457
Merge: 33e4e30d0 70a07fa90
Author: Nick Mathewson 
Date:   Mon Aug 27 09:39:08 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27345| 5 +
 src/test/include.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 33e4e30d0a0aa8717ca67cb82581e536b402f30b
Merge: e01ea64f0 98e1a1d10
Author: Nick Mathewson 
Date:   Fri Aug 24 12:32:10 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit e01ea64f0a072b321bb8b33e32cfa5644b4364d4
Merge: 8691046ac 36bb11a65
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 8691046ac668282de421bd66c14748faac693749
Merge: 3cfceeb45 c1ad40627
Author: Nick Mathewson 
Date:   Wed Aug 22 09:37:31 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 src/or/connection_edge.c | 1 -
 src/test/test_tortls.c   | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 3cfceeb45d51f8f3c4960cabaad1849dcecb14a3
Merge: f0633bc49 a5bbe3f1d
Author: Nick Mathewson 
Date:   Tue Aug 21 20:04:17 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 245025a3dff5ffb893c0cc079a8e5d59df553529
Merge: 4c0c4d4ad d52f40600
Author: Nick Mathewson 
Date:   Tue Aug 21 19:16:40 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27226   |   5 +++
 src/common/tortls.c|  10 +++--
 src/test/test_tortls.c | 119 +
 3 files changed, 71 insertions(+), 63 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 936e2aa0de6edb0578e18ad0760a67ad64a448d4
Merge: 4847e2216 c798957b5
Author: Nick Mathewson 
Date:   Thu Aug 16 08:37:11 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26932| 3 +++
 src/or/hs_service.c | 1 +
 2 files changed, 4 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 4847e221689f702f74d6dd15181216aeabbb6785
Merge: 0fc171a47 db3414dd5
Author: Nick Mathewson 
Date:   Thu Aug 16 08:35:27 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 doc/HACKING/GettingStartedRust.md | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --cc doc/HACKING/GettingStartedRust.md
index a533ba8a2,920596cad..aa29c097d
--- a/doc/HACKING/GettingStartedRust.md
+++ b/doc/HACKING/GettingStartedRust.md
@@@ -122,23 -119,13 +122,25 @@@ the module calls.  Modules which call f
  
  Strive to change the C API as little as possible.
  
- We are currently targeting Rust nightly, *for now*. We expect this to
- change moving forward, as we understand more about which nightly
- features we need. It is on our TODO list to try to cultivate good
+ We are currently targetting Rust stable. (See CodingStandardsRust.md for more
+ details.)
+ 
 -It is on our TODO list to try to cultivate good standing with various distro
 -maintainers of `rustc` and `cargo`, in order to ensure that whatever version 
we
 -solidify on is readily available.
++It is on our TODO list to try to cultivate good
 +standing with various distro maintainers of `rustc` and `cargo`, in
 +order to ensure that whatever version we solidify on is readily
 +available.
 +
 +If parts of your Rust code needs to stay in sync with C code (such as
 +handling enums across the FFI boundary), annonotate these places in a
 +comment structured as follows:
 +
 +  /// C_RUST_COUPLED:  ``
 +
 +Where  can be an enum, struct, constant, etc.  Then,
 +do the same in the C code, to note that rust will need to be changed
 +when the C does.
 +
+ 
   Adding your Rust module to Tor's build system
  ---
  



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 0fc171a47be0cb3b1021816ab80ef823063ce2d1
Merge: 1868982de a26a2735b
Author: Nick Mathewson 
Date:   Wed Aug 15 12:20:57 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27081 | 4 
 configure.ac | 6 --
 2 files changed, 8 insertions(+), 2 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit fde551a387bf743dd974512f63405c6e63de49b4
Merge: c4d0d9bd2 8982719f6
Author: Nick Mathewson 
Date:   Thu Aug 9 08:47:25 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/geoip-2018-08-07 | 4 +
 src/config/geoip | 14291 ++---
 src/config/geoip6|   974 ++-
 3 files changed, 9063 insertions(+), 6206 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 00536254b765900127af04f278ed591d562434d9
Merge: 2a6c1585b 8e68fe7e1
Author: Nick Mathewson 
Date:   Wed Aug 8 09:26:23 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug25440 | 5 +
 src/common/sandbox.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 2a6c1585b0f13e03eb7e8b8977d56a5cea8b4ce8
Merge: eb604f5fa 4856a6e6c
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit a159eaf45fb59fb47732d5d811db2cc78c02a960
Merge: 15d7f24c5 fea35ddf0
Author: Nick Mathewson 
Date:   Mon Jul 30 08:45:01 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26924   |  4 
 changes/bug26927   |  4 
 src/or/connection_or.c | 14 +-
 3 files changed, 17 insertions(+), 5 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 15d7f24c57828b94596ccfd97081840b920c2336
Merge: dbf57ecf3 a8bdb851e
Author: Nick Mathewson 
Date:   Mon Jul 30 08:17:24 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26785   | 4 
 configure.ac   | 3 +++
 src/common/compress_zstd.c | 4 
 3 files changed, 11 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit dbf57ecf39e3066b567c5aade9e8b5575e1e1ec0
Merge: 0a60a94a5 be3a962ca
Author: Nick Mathewson 
Date:   Fri Jul 20 10:42:29 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/ticket26647 | 4 
 src/or/control.c| 4 
 2 files changed, 8 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 0a60a94a558012f3b28162f06216ed5e2a4b5b0c
Merge: e0f99404f 209332e71
Author: Nick Mathewson 
Date:   Thu Jul 19 08:31:07 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26853| 3 +++
 src/test/test_key_expiration.sh | 8 
 2 files changed, 11 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 9e247ac271b849d1f627d9d8c8d3815b77f8f975
Merge: c31700d66 78386d8cd
Author: Nick Mathewson 
Date:   Wed Jul 18 16:39:10 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 src/test/test_bt.sh | 2 ++
 1 file changed, 2 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit e0f99404f552e047b268c6c47691143a1491ec72
Merge: 9e247ac27 312a42fc8
Author: Nick Mathewson 
Date:   Wed Jul 18 16:39:25 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26787 | 3 +++
 1 file changed, 3 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit c31700d6640a10eb5e406205c2753e69efd217ec
Merge: 28d1057d5 559f79fd7
Author: Nick Mathewson 
Date:   Wed Jul 18 15:04:14 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26485|  4 
 src/or/config.c |  9 -
 src/or/dirserv.c| 43 +--
 src/or/dirserv.h|  3 +--
 src/or/dirvote.c|  9 -
 src/test/test_dir.c | 53 -
 6 files changed, 110 insertions(+), 11 deletions(-)

diff --cc src/test/test_dir.c
index 165029d23,28489d939..a33b23bcc
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@@ -5753,106 -6193,57 +5753,157 @@@ test_dir_platform_str(void *arg
;
  }
  
 +static networkstatus_t *mock_networkstatus;
 +
 +static networkstatus_t *
 +mock_networkstatus_get_latest_consensus_by_flavor(consensus_flavor_t f)
 +{
 +  (void)f;
 +  return mock_networkstatus;
 +}
 +
 +static void
 +test_dir_networkstatus_consensus_has_ipv6(void *arg)
 +{
 +  (void)arg;
 +
 +  int has_ipv6 = 0;
 +
 +  /* Init options and networkstatus */
 +  or_options_t our_options;
 +  mock_options = _options;
 +  reset_options(mock_options, _get_options_calls);
 +  MOCK(get_options, mock_get_options);
 +
 +  networkstatus_t our_networkstatus;
 +  mock_networkstatus = _networkstatus;
 +  memset(mock_networkstatus, 0, sizeof(*mock_networkstatus));
 +  MOCK(networkstatus_get_latest_consensus_by_flavor,
 +   mock_networkstatus_get_latest_consensus_by_flavor);
 +
 +  /* A live consensus */
 +  mock_networkstatus->valid_after = time(NULL) - 3600;
 +  mock_networkstatus->valid_until = time(NULL) + 3600;
 +
 +  /* Test the bounds for A lines in the NS consensus */
 +  mock_options->UseMicrodescriptors = 0;
 +
 +  mock_networkstatus->consensus_method = MIN_METHOD_FOR_A_LINES;
 +  has_ipv6 = networkstatus_consensus_has_ipv6(get_options());
 +  tt_assert(has_ipv6);
 +
 +  mock_networkstatus->consensus_method = MIN_METHOD_FOR_A_LINES + 1;
 +  has_ipv6 = networkstatus_consensus_has_ipv6(get_options());
 +  tt_assert(has_ipv6);
 +
 +  mock_networkstatus->consensus_method = MIN_METHOD_FOR_A_LINES + 20;
 +  has_ipv6 = networkstatus_consensus_has_ipv6(get_options());
 +  tt_assert(has_ipv6);
 +
 +  mock_networkstatus->consensus_method = MIN_METHOD_FOR_A_LINES - 1;
 +  has_ipv6 = networkstatus_consensus_has_ipv6(get_options());
 +  tt_assert(!has_ipv6);
 +
 +  /* Test the bounds for A lines in the microdesc consensus */
 +  mock_options->UseMicrodescriptors = 1;
 +
 +  mock_networkstatus->consensus_method =
 +  MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS;
 +  has_ipv6 = networkstatus_consensus_has_ipv6(get_options());
 +  tt_assert(has_ipv6);
 +
 +  mock_networkstatus->consensus_method =
 +  MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS + 1;
 +  has_ipv6 = networkstatus_consensus_has_ipv6(get_options());
 +  tt_assert(has_ipv6);
 +
 +  mock_networkstatus->consensus_method =
 +  MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS + 20;
 +  has_ipv6 = networkstatus_consensus_has_ipv6(get_options());
 +  tt_assert(has_ipv6);
 +
 +  mock_networkstatus->consensus_method =
 +  MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS - 1;
 +  has_ipv6 = networkstatus_consensus_has_ipv6(get_options());
 +  tt_assert(!has_ipv6);
 +
 +  /* Test the edge cases */
 +  mock_options->UseMicrodescriptors = 1;
 +  mock_networkstatus->consensus_method =
 +  MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS;
 +
 +  /* Reasonably live */
 +  mock_networkstatus->valid_until = approx_time() - 60;
 +  has_ipv6 = networkstatus_consensus_has_ipv6(get_options());
 +  tt_assert(has_ipv6);
 +
 +  /* Not reasonably live */
 +  mock_networkstatus->valid_after = approx_time() - 24*60*60 - 3600;
 +  mock_networkstatus->valid_until = approx_time() - 24*60*60 - 60;
 +  has_ipv6 = networkstatus_consensus_has_ipv6(get_options());
 +  tt_assert(!has_ipv6);
 +
 +  /* NULL consensus */
 +  mock_networkstatus = NULL;
 +  has_ipv6 = networkstatus_consensus_has_ipv6(get_options());
 +  tt_assert(!has_ipv6);
 +
 + done:
 +  UNMOCK(get_options);
 +  UNMOCK(networkstatus_get_latest_consensus_by_flavor);
 +}
 +
+ static void
+ test_dir_format_versions_list(void *arg)
+ {
+   (void)arg;
+   char *s = NULL;
+   config_line_t *lines = NULL;
+ 
+   setup_capture_of_logs(LOG_WARN);
+   s = format_recommended_version_list(lines, 1);
+   tt_str_op(s, OP_EQ, "");
+ 
+   tor_free(s);
+   config_line_append(, "ignored", "0.3.4.1, 0.2.9.111-alpha, 4.4.4-rc");
+   s = format_recommended_version_list(lines, 1);
+   tt_str_op(s, OP_EQ,  "0.2.9.111-alpha,0.3.4.1,4.4.4-rc");
+ 
+   tor_free(s);
+   config_line_append(, "ignored", "0.1.2.3,0.2.9.10   ");
+   s = format_recommended_version_list(lines, 1);
+   tt_str_op(s, OP_EQ,  "0.1.2.3,0.2.9.10,0.2.9.111-alpha,0.3.4.1,4.4.4-rc");
+ 
+   /* There should be no warnings so far. */
+   expect_no_log_entry();
+ 
+   /* Now try a line with a space in it. */
+   tor_free(s);
+   config_line_append(, "ignored", 

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

[nickm]

commit 28d1057d5658a47dfcaa52c163e5861b4db5670a
Merge: 710188f84 61a2762e3
Author: Nick Mathewson 
Date:   Tue Jul 17 14:56:52 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26830| 3 +++
 src/test/test_keygen.sh | 8 
 2 files changed, 11 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 710188f84e9d6652662901403d0ae31392714306
Merge: f5e3bcb60 98ee23ca1
Author: Nick Mathewson 
Date:   Thu Jul 12 14:32:16 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/task26771| 4 
 src/or/auth_dirs.inc | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 69918629f56ee61ff6c538ea53caefefbabf84f6
Merge: 532873a92 4a604d993
Author: Nick Mathewson 
Date:   Mon Jul 9 10:14:43 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26269 |  5 +
 src/or/router.c  | 15 +--
 2 files changed, 14 insertions(+), 6 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 250e0fc1c4b1a4d1fdeb38c43399624996babab9
Merge: 69918629f 6ad2c2b92
Author: Nick Mathewson 
Date:   Mon Jul 9 10:17:20 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 src/test/test_entrynodes.c | 6 ++
 1 file changed, 6 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 451a84cecb4bc98fd2ac86aeff1c10c1cac0fd79
Merge: fead22fb2 d3894dc34
Author: Nick Mathewson 
Date:   Mon Jul 9 09:11:41 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/geoip-2018-07-03 |4 +
 src/config/geoip | 7171 --
 src/config/geoip6|  752 +++--
 3 files changed, 3732 insertions(+), 4195 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 4c094436c50a489d2ecdd09b8dfb7dc9a3c97389
Merge: 9aeef05f8 a4e8f9450
Author: Nick Mathewson 
Date:   Tue Jul 3 09:48:03 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26535.029| 5 +
 changes/bug26535.032| 5 +
 src/test/hs_ntor_ref.py | 7 +--
 src/test/ntor_ref.py| 9 ++---
 4 files changed, 21 insertions(+), 5 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 72ee0b6f793949c4637c5878c51a39316f0b336e
Merge: 36c372581 3c97b148a
Author: Nick Mathewson 
Date:   Fri Jun 29 23:12:03 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 scripts/maint/checkSpace.pl | 5 -
 1 file changed, 5 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 36c372581f8d7651c336f69b9b1b051d3d31d548
Merge: 92b4996b2 ed84dab8b
Author: Nick Mathewson 
Date:   Fri Jun 29 13:49:43 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 src/test/test_channelpadding.c | 1 +
 src/test/test_hs_descriptor.c  | 3 +++
 src/test/test_shared_random.c  | 1 +
 3 files changed, 5 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 92b4996b233a6a5d034b4ecc47b9f97985bb5886
Merge: f82f8179e 6e9d5fc4e
Author: Nick Mathewson 
Date:   Fri Jun 29 13:07:13 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 src/or/hs_client.c| 6 +++---
 src/test/test_hs_common.c | 7 ++-
 src/test/test_hs_intropoint.c | 7 +++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --cc src/test/test_hs_common.c
index 17ba11ca7,3ae623ed0..16803dbd1
--- a/src/test/test_hs_common.c
+++ b/src/test/test_hs_common.c
@@@ -302,11 -303,11 +303,12 @@@ helper_add_hsdir_to_networkstatus(netwo
memset(>cache_info.signing_key_cert->signing_key,
   identity_idx, ED25519_PUBKEY_LEN);
tt_assert(nodelist_set_routerinfo(ri, NULL));
-   node_t *node = node_get_mutable_by_id(ri->cache_info.identity_digest);
+ 
+   node = node_get_mutable_by_id(ri->cache_info.identity_digest);
tt_assert(node);
node->rs = rs;
 -  /* We need this to exist for node_has_descriptor() to return true. */
 +  /* We need this to exist for node_has_preferred_descriptor() to return
 +   * true. */
node->md = tor_malloc_zero(sizeof(microdesc_t));
/* Do this now the nodelist_set_routerinfo() function needs a "rs" to set
 * the indexes which it doesn't have when it is called. */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit df896ed6323f6f0493393f97e739501df8092e7f
Merge: f8dad5a07 fe2588a5a
Author: Nick Mathewson 
Date:   Fri Jun 29 13:00:56 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 src/or/routerlist.c   | 2 ++
 src/or/shared_random_state.c  | 1 +
 src/test/test_hs.c| 7 +--
 src/test/test_shared_random.c | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --cc src/or/routerlist.c
index 1bfbd9f67,95b39d357..203895c86
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@@ -2758,9 -2755,11 +2758,11 @@@ frac_nodes_with_descriptors(const smart
total <= 0.0) {
  int n_with_descs = 0;
  SMARTLIST_FOREACH(sl, const node_t *, node, {
 -  if (node_has_descriptor(node))
 +  if (node_has_any_descriptor(node))
  n_with_descs++;
  });
+ 
+ tor_free(bandwidths);
  return ((double)n_with_descs) / (double)smartlist_len(sl);
}
  



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit f82f8179e65c5e0021da46fd24e4bd7d8126d8f7
Merge: df896ed63 68dfbd5ef
Author: Nick Mathewson 
Date:   Fri Jun 29 13:06:15 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/ticket26467|  3 +++
 src/or/directory.c |  1 +
 src/or/hs_descriptor.c |  1 +
 src/test/hs_test_helpers.c |  6 ++
 src/test/test_channelpadding.c |  2 ++
 src/test/test_hs_descriptor.c  | 11 +--
 6 files changed, 18 insertions(+), 6 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit f8dad5a079ac356ef72f14cfddca2d81fd824102
Merge: 8b108935b 25226fb26
Author: Nick Mathewson 
Date:   Tue Jun 26 09:21:59 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/feature26372_029 | 4 
 configure.ac | 6 +-
 2 files changed, 9 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit a360bf287d8220ec2e4899c57ed47a2a91e3bcb9
Merge: ccf1eb316 6107a2127
Author: Nick Mathewson 
Date:   Sun Jun 17 19:24:48 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 .editorconfig | 33 +
 1 file changed, 33 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit ca6d289c00e5e18b24c7f463e709125e545d4405
Merge: 049ba6674 7e7585d0a
Author: Nick Mathewson 
Date:   Wed Jun 13 09:59:28 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26158 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 049ba66746006e45d8033d8f88f97ba61d8c5631
Merge: 1c80eb92f 6017447e3
Author: Nick Mathewson 
Date:   Wed Jun 13 09:58:05 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26158  | 5 +
 src/or/circuitbuild.c | 1 +
 2 files changed, 6 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 1c80eb92fa6c5240b1029c5ee1febe2d20b7d882
Merge: 5f39b ff70cc84f
Author: Nick Mathewson 
Date:   Wed Jun 13 09:57:10 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug25686_diagnostic | 4 
 src/or/directory.c  | 5 +++--
 src/or/router.c | 8 +++-
 3 files changed, 14 insertions(+), 3 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit eaa359650cd4654744f8750ee6a59d8653e96147
Merge: f2e7570c7 53513e4bf
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 7fff99110b6d00dbd438ce9182474f045f996f3f
Merge: 6dca180ae 5d8a927aa
Author: Nick Mathewson 
Date:   Tue Jun 12 08:18:56 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 6dca180ae9abcd5bd12c6aa4dda8d3e19017a6cb
Merge: a14112743 74ac463e7
Author: Nick Mathewson 
Date:   Tue Jun 12 08:11:20 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/geoip-2018-06-07 |4 +
 src/config/geoip | 5848 +-
 src/config/geoip6|  810 ++-
 3 files changed, 4354 insertions(+), 2308 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit a141127435383840e48e6a06efbfc85eefaf06a8
Merge: f15f90e2c dd63033fc
Author: Nick Mathewson 
Date:   Fri Jun 8 10:12:57 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26196  |  4 
 src/or/protover.c | 13 +
 2 files changed, 17 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit c27bb4072ca25b154e100158f819315bd8683ce0
Merge: fa1890e97 dd63033fc
Author: Nick Mathewson 
Date:   Fri Jun 8 10:11:57 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26196  |  4 
 src/or/protover.c | 13 +
 2 files changed, 17 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 0ef432d4577790b36bd7945c51382271ce0d2105
Merge: c000763f1 3f3739c6e
Author: Nick Mathewson 
Date:   Thu May 24 09:40:06 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 src/test/test_crypto.c | 41 +
 1 file changed, 41 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 3c4353179f2304767f5084734a7d1550f51f4542
Merge: 6acbd4c11 8340f641c
Author: Nick Mathewson 
Date:   Wed May 16 12:11:45 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26072 | 5 +
 src/or/relay.c   | 1 +
 2 files changed, 6 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 6acbd4c112d984c8a3fcfa1a387093131b740ca7
Merge: b343ba906 4aa3d511b
Author: Nick Mathewson 
Date:   Tue May 15 09:32:44 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/geoip-2018-05-01 |4 +
 src/config/geoip | 5455 ++
 src/config/geoip6|  971 +++--
 3 files changed, 4468 insertions(+), 1962 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit b343ba90604de524b5fa7d87a6daf76fcc118adb
Merge: f64fa6b19 7ee67c47f
Author: Nick Mathewson 
Date:   Thu May 10 09:22:32 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26069   | 5 +
 src/or/hs_descriptor.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit f64fa6b19ec7663f47e600599761fadbde4135e9
Merge: 59812789f 15b8c860d
Author: Nick Mathewson 
Date:   Thu May 10 09:19:28 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 src/test/test_dir.c | 20 
 1 file changed, 20 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 59812789f7b16647762a7a79fc6db381e945a701
Merge: abde29824 e5acbbd16
Author: Nick Mathewson 
Date:   Thu May 10 08:03:04 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/ticket26062| 3 +++
 src/or/networkstatus.c | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit abde29824ceb76bd21e728260796ecb4ff55151a
Merge: a639a6784 394f102ea
Author: Nick Mathewson 
Date:   Wed May 9 11:53:18 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug25761 | 3 +++
 src/or/hs_service.c  | 5 -
 src/or/rendservice.c | 5 +++--
 3 files changed, 6 insertions(+), 7 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 4c6a407b9d9436948dbbecffde32e28380240728
Merge: 44626b37f be5b4415c
Author: Nick Mathewson 
Date:   Thu May 3 13:38:54 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit c66b512671cf1711c7325db664335f1694bb3109
Merge: b116710e3 246765342
Author: Nick Mathewson 
Date:   Wed May 2 08:46:28 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26007 |  5 +
 src/or/dirserv.c | 13 +++--
 2 files changed, 16 insertions(+), 2 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 58f54a3588cf722a31b10fa0450225f7685c8629
Merge: 85cd8386f 7c3f87eb4
Author: Nick Mathewson 
Date:   Wed Apr 25 08:01:54 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 src/or/router.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 85cd8386fa7da82d453bfb31b39184fbd8d96e08
Merge: d44753b0e 89a3fafd4
Author: Nick Mathewson 
Date:   Tue Apr 24 10:38:37 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 7e7b052b2a114900b5e6575fd5375dc00c09d5db
Merge: 6182f60f7 9187cdb1c
Author: Nick Mathewson 
Date:   Tue Apr 24 10:37:36 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug25901| 3 +++
 src/or/hs_service.c | 4 
 2 files changed, 7 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 6182f60f758f85a214a7e84d76f6fddb2bffd730
Merge: e8683bcbb d2951b381
Author: Nick Mathewson 
Date:   Tue Apr 24 08:51:55 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug23693.1 |  4 
 src/or/config.c| 12 ++--
 src/or/main.c  |  2 +-
 src/or/router.c| 21 ++---
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --cc src/or/config.c
index 986794cec,79cfcb411..cf2f58498
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -4739,19 -4656,22 +4746,20 @@@ static in
  options_transition_affects_workers(const or_options_t *old_options,
 const or_options_t *new_options)
  {
 -  if (!opt_streq(old_options->DataDirectory, new_options->DataDirectory) ||
 -  old_options->NumCPUs != new_options->NumCPUs ||
 -  !config_lines_eq(old_options->ORPort_lines, new_options->ORPort_lines) 
||
 -  old_options->ServerDNSSearchDomains !=
 -   new_options->ServerDNSSearchDomains ||
 -  old_options->SafeLogging_ != new_options->SafeLogging_ ||
 -  old_options->ClientOnly != new_options->ClientOnly ||
 -  server_mode(old_options) != server_mode(new_options) ||
 -  dir_server_mode(old_options) != dir_server_mode(new_options) ||
 +  YES_IF_CHANGED_STRING(DataDirectory);
 +  YES_IF_CHANGED_INT(NumCPUs);
 +  YES_IF_CHANGED_LINELIST(ORPort_lines);
 +  YES_IF_CHANGED_BOOL(ServerDNSSearchDomains);
 +  YES_IF_CHANGED_BOOL(SafeLogging_);
 +  YES_IF_CHANGED_BOOL(ClientOnly);
 +  YES_IF_CHANGED_BOOL(LogMessageDomains);
 +  YES_IF_CHANGED_LINELIST(Logs);
 +
 +  if (server_mode(old_options) != server_mode(new_options) ||
-   public_server_mode(old_options) != public_server_mode(new_options))
+   public_server_mode(old_options) != public_server_mode(new_options) ||
 -  !config_lines_eq(old_options->Logs, new_options->Logs) ||
 -  old_options->LogMessageDomains != new_options->LogMessageDomains)
++  dir_server_mode(old_options) != dir_server_mode(new_options))
  return 1;
  
 -  /* Check whether log options match. */
 -
/* Nothing that changed matters. */
return 0;
  }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit e8683bcbb19318fcd9df04464296d6581adc959d
Merge: cb813a352 1438c6c71
Author: Nick Mathewson 
Date:   Mon Apr 23 09:24:33 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug24969 | 3 +++
 src/common/sandbox.c | 3 +++
 2 files changed, 6 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit beb321d8cdd6e7a2f0b9a0a4758cd71768531959
Merge: 44aa586de 1438c6c71
Author: Nick Mathewson 
Date:   Mon Apr 23 09:23:31 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug24969 | 3 +++
 src/common/sandbox.c | 3 +++
 2 files changed, 6 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 44aa586dea7d8fb4a7db2d0beae46a0c3ae7589b
Merge: 93ff1870b f0230ee38
Author: Nick Mathewson 
Date:   Tue Apr 17 10:48:18 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 .travis.yml   | 9 -
 changes/coveralls | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --cc .travis.yml
index 27534e4cf,bf55b7756..3d61f5a61
--- a/.travis.yml
+++ b/.travis.yml
@@@ -97,9 -96,9 +97,11 @@@ matrix
include:
  - compiler: gcc
  - compiler: gcc
 +  env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
 +- compiler: gcc
env: RUST_OPTIONS=""
+ - compiler: gcc
+   env: COVERAGE_OPTIONS="--enable-coverage"
  ## The "sudo: required" forces non-containerized builds, working
  ## around a Travis CI environment issue: clang LeakAnalyzer fails
  ## because it requires ptrace and the containerized environment no



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 9ef4c05df8323850b5894782f435da15810d6189
Merge: 22845df2a c5899d5cf
Author: Nick Mathewson 
Date:   Mon Apr 16 13:48:23 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 src/common/address.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 0b1a054d68f4ebb760add6d3a1bda75fb8b17553
Merge: 306563ac6 d3ac47b41
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:32 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 12fc4206f28576d872033b8a99756252e5354662
Merge: 2dee38fba 124e06e85
Author: Nick Mathewson 
Date:   Thu Apr 5 12:09:00 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug25296_032 |  5 +
 doc/tor.1.txt| 12 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --cc doc/tor.1.txt
index 415cd6f3a,d7884968e..af2ac090c
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@@ -238,18 -236,17 +238,18 @@@ GENERAL OPTION
  [[RelayBandwidthBurst]] **RelayBandwidthBurst** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
  If not 0, limit the maximum token bucket size (also known as the burst) 
for
  \_relayed traffic_ to the given number of bytes in each direction.
 -(Default: 0)
 +They do not include directory fetches by the relay (from authority
 +or other relays), because that is considered "client" activity. (Default: 
0)
  
  [[PerConnBWRate]] **PerConnBWRate** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
- If set, do separate rate limiting for each connection from a non-relay.
- You should never need to change this value, since a network-wide value is
- published in the consensus and your relay will use that value. (Default: 
0)
+ If this option is set manually, or via the "perconnbwrate" consensus
+ field, Tor will use it for separate rate limiting for each connection
+ from a non-relay. (Default: 0)
  
  [[PerConnBWBurst]] **PerConnBWBurst** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
- If set, do separate rate limiting for each connection from a non-relay.
- You should never need to change this value, since a network-wide value is
- published in the consensus and your relay will use that value. (Default: 
0)
+ If this option is set manually, or via the "perconnbwburst" consensus
+ field, Tor will use it for separate rate limiting for each connection
+ from a non-relay. (Default: 0)
  
  [[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ 
socks4|socks5 __IP__:__PORT__::
  **ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]::



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 2dee38fba0193c952500b9d0227ebcff6d5432d6
Merge: 78bf56416 df519e5de
Author: Nick Mathewson 
Date:   Thu Apr 5 08:36:13 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 .travis.yml | 4 ++--
 changes/ticket25714 | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 78bf56416868ed6de53af63d49c6d8555150f856
Merge: ac3e389db 9b10eb2d7
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit da5173c83148b4b437488571c2f6e88dc2e175eb
Merge: 46c2b0ca2 0b795ce6d
Author: Nick Mathewson 
Date:   Tue Mar 27 18:25:31 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 33606405e3070de6517690b1494f16c04524ce72
Merge: eacfd2911 b5a6c0399
Author: Nick Mathewson 
Date:   Mon Mar 26 10:29:29 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/feature25313 |  4 
 src/common/sandbox.c | 23 ++-
 2 files changed, 6 insertions(+), 21 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 910422e8fae173f061d016c72eecc2015a09537e
Merge: 85719b79b 66d312063
Author: Nick Mathewson 
Date:   Mon Mar 19 16:59:49 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 src/test/test_hs_service.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 85719b79b71eb5a4ef889272a393aa97bbc86134
Merge: 9d1c7c3a8 bc0de600b
Author: Nick Mathewson 
Date:   Mon Mar 19 05:42:43 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 .travis.yml | 24 
 1 file changed, 20 insertions(+), 4 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 296e429ebcb676b39a574bf8e8850c53bb659d74
Merge: f0f2fab5e a0cc7e949
Author: Nick Mathewson 
Date:   Mon Mar 19 05:36:06 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug25450   |  8 
 src/test/test_hs_service.c | 11 ++-
 2 files changed, 14 insertions(+), 5 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 6bc324c96abd463c4a386e81bd71b594ac59fed7
Merge: 950606dcc d60dc2755
Author: Nick Mathewson 
Date:   Tue Mar 13 10:59:30 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 950606dcc947fee4a7196bce0bab1595164fbab0
Merge: 676a28599 38b7885c9
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:03 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 676a28599dcc3854a98c684808055db76dcd265b
Merge: e9dbd6dd8 094294dbb
Author: Nick Mathewson 
Date:   Tue Mar 13 13:41:24 2018 +0100

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug25474 | 5 +
 configure.ac | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 35d945a646b3384640d3863aec07d873179efffd
Merge: 15f6201a5 0026d1a67
Author: Nick Mathewson 
Date:   Sat Mar 3 11:33:33 2018 -0500

Merge branch 'maint-0.3.2' into maint-0.3.3

"ours" merge to avoid version bump.




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit e0903ebd88a47a03a5e432e1a6c98452ae8a9008
Merge: f7eff2f8c 1ec386561
Author: Nick Mathewson 
Date:   Thu Mar 1 16:43:42 2018 -0500

Merge branch 'maint-0.3.2' into maint-0.3.3

"ours" to avoid version bump.




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit f7eff2f8c53dacb7c375bbe6bc9cced95103307d
Merge: d489e4847 d01abb934
Author: Nick Mathewson 
Date:   Thu Mar 1 16:10:43 2018 -0500

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug25249 |   3 +
 changes/bug25249.2   |   3 +
 changes/trove-2018-001.1 |   6 ++
 changes/trove-2018-004   |   8 +++
 src/or/protover.c|  35 --
 src/test/test_protover.c | 171 +++
 6 files changed, 220 insertions(+), 6 deletions(-)

diff --cc src/test/test_protover.c
index d3d146256,9b94044b9..c343e9957
--- a/src/test/test_protover.c
+++ b/src/test/test_protover.c
@@@ -199,208 -276,82 +292,285 @@@ test_protover_all_supported(void *arg
  }
  
  static void
 +test_protover_list_supports_protocol_returns_true(void *arg)
 +{
 +  (void)arg;
 +
 +  const char *protocols = "Link=1";
 +  int is_supported = protocol_list_supports_protocol(protocols, PRT_LINK, 1);
 +  tt_int_op(is_supported, OP_EQ, 1);
 +
 + done:
 +  ;
 +}
 +
 +static void
 +test_protover_list_supports_protocol_for_unsupported_returns_false(void *arg)
 +{
 +  (void)arg;
 +
 +  const char *protocols = "Link=1";
 +  int is_supported = protocol_list_supports_protocol(protocols, PRT_LINK, 10);
 +  tt_int_op(is_supported, OP_EQ, 0);
 +
 + done:
 +  ;
 +}
 +
 +static void
 +test_protover_supports_version(void *arg)
 +{
 +  (void)arg;
 +
 +  tt_assert(protocol_list_supports_protocol("Link=3-6", PRT_LINK, 3));
 +  tt_assert(protocol_list_supports_protocol("Link=3-6", PRT_LINK, 6));
 +  tt_assert(!protocol_list_supports_protocol("Link=3-6", PRT_LINK, 7));
 +  tt_assert(!protocol_list_supports_protocol("Link=3-6", PRT_LINKAUTH, 3));
 +
 +  tt_assert(!protocol_list_supports_protocol("Link=4-6 LinkAuth=3",
 +PRT_LINKAUTH, 2));
 +  tt_assert(protocol_list_supports_protocol("Link=4-6 LinkAuth=3",
 +PRT_LINKAUTH, 3));
 +  tt_assert(!protocol_list_supports_protocol("Link=4-6 LinkAuth=3",
 + PRT_LINKAUTH, 4));
 +  tt_assert(!protocol_list_supports_protocol_or_later("Link=4-6 LinkAuth=3",
 + PRT_LINKAUTH, 4));
 +  tt_assert(protocol_list_supports_protocol_or_later("Link=4-6 LinkAuth=3",
 + PRT_LINKAUTH, 3));
 +  tt_assert(protocol_list_supports_protocol_or_later("Link=4-6 LinkAuth=3",
 + PRT_LINKAUTH, 2));
 +
 +  tt_assert(!protocol_list_supports_protocol_or_later("Link=4-6 LinkAuth=3",
 +  PRT_DESC, 2));
 + done:
 + ;
 +}
 +
 +/* This could be MAX_PROTOCOLS_TO_EXPAND, but that's not exposed by protover 
*/
 +#define MAX_PROTOCOLS_TO_TEST 1024
 +
 +/* LinkAuth and Relay protocol versions.
 + * Hard-coded here, because they are not in the code, or not exposed in the
 + * headers. */
 +#define PROTOVER_LINKAUTH_V1 1
 +#define PROTOVER_LINKAUTH_V3 3
 +
 +#define PROTOVER_RELAY_V1 1
 +#define PROTOVER_RELAY_V2 2
 +
 +/* Highest supported HSv2 introduce protocol version.
 + * Hard-coded here, because it does not appear anywhere in the code.
 + * It's not clear if we actually support version 2, see #25068. */
 +#define PROTOVER_HSINTRO_V2 3
 +
 +/* HSv2 Rend and HSDir protocol versions.
 + * Hard-coded here, because they do not appear anywhere in the code. */
 +#define PROTOVER_HS_RENDEZVOUS_POINT_V2 1
 +#define PROTOVER_HSDIR_V2 1
 +
 +/* DirCache, Desc, Microdesc, and Cons protocol versions.
 + * Hard-coded here, because they do not appear anywhere in the code. */
 +#define PROTOVER_DIRCACHE_V1 1
 +#define PROTOVER_DIRCACHE_V2 2
 +
 +#define PROTOVER_DESC_V1 1
 +#define PROTOVER_DESC_V2 2
 +
 +#define PROTOVER_MICRODESC_V1 1
 +#define PROTOVER_MICRODESC_V2 2
 +
 +#define PROTOVER_CONS_V1 1
 +#define PROTOVER_CONS_V2 2
 +
 +/* Make sure we haven't forgotten any supported protocols */
 +static void
 +test_protover_supported_protocols(void *arg)
 +{
 +  (void)arg;
 +
 +  const char *supported_protocols = protover_get_supported_protocols();
 +
 +  /* Test for new Link in the code, that hasn't been added to supported
 +   * protocols */
 +  tt_assert(protocol_list_supports_protocol(supported_protocols,
 +PRT_LINK,
 +MAX_LINK_PROTO));
 +  for (uint16_t i = 0; i < MAX_PROTOCOLS_TO_TEST; i++) {
 +if (is_or_protocol_version_known(i)) {
 +  tt_assert(protocol_list_supports_protocol(supported_protocols,
 +PRT_LINK,
 +i));
 +}
 +  }
 +
 +  /* Legacy LinkAuth does not appear anywhere in the code. */
 +  tt_assert(protocol_list_supports_protocol(supported_protocols,
 +PRT_LINKAUTH,
 +PROTOVER_LINKAUTH_V1));
 

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

[nickm]

commit 8a5cb58ad0b8e553d9df24aca02b0f8af5c0d47c
Merge: 6384d314f bcfb03495
Author: Nick Mathewson 
Date:   Wed Feb 21 11:53:50 2018 -0500

Merge branch 'maint-0.3.2' into maint-0.3.3

 .gitmodules | 2 +-
 changes/ticket25323 | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 6384d314fb47a088299a14b52e5f60b6e79697b4
Merge: 9f1899fdf bd71e0a0c
Author: Nick Mathewson 
Date:   Fri Feb 16 09:55:41 2018 -0500

Merge branch 'maint-0.3.2' into maint-0.3.3

"ours" merge to avoid taking 24902 a second time and having to reconcile
all the merge conflicts.




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 9f1899fdfd611861bd1a254a6ba6df4ddf05f5da
Merge: 8970058af c67adddac
Author: Nick Mathewson 
Date:   Fri Feb 16 08:49:08 2018 -0500

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug24898-029 | 6 --
 1 file changed, 6 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[nickm]

commit 8970058af6822b14bc06e7a98230b8b13c0084a9
Merge: d662d4470 c8b087d90
Author: Nick Mathewson 
Date:   Fri Feb 16 08:47:41 2018 -0500

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug24898-029 | 6 ++
 1 file changed, 6 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits