[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 5b04392c1553e2a3e278a48f8d0e071181c0444f Merge: 0971b3ce4 e24195c7c Author: Nick Mathewson Date: Fri Sep 21 09:35:23 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27316 | 3 +++ src/or/protover.c| 15 +++ src/test/test_protover.c | 4 3 files changed, 22 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 9697c2da4680267038d407093cbcbc4c68059904 Merge: 5a8827a4c c02f2d9eb Author: Nick Mathewson Date: Thu Sep 13 11:46:04 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 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/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 5a8827a4c98a354c775060f6c85c05a97c56e9b4 Merge: c3a750486 198b6354e Author: Nick Mathewson Date: Tue Sep 11 13:09:21 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 3119cb5062e2cc7aee46c853a9c7373e6efdaaea Merge: 8408331b3 19429fac2 Author: Nick Mathewson Date: Tue Sep 11 12:04:55 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 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/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 8408331b3e965dfad3c79fadc51f0b01eed366fe Merge: ec4a7641f b203dedaf Author: Nick Mathewson Date: Mon Sep 10 09:41:39 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 "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/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 36885f34f6e8dc7f5791e4ba2c4eefff5f9de9e0 Merge: cdaf9aec8 da29074fc Author: Nick Mathewson Date: Fri Sep 7 15:11:49 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 "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/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 0366ae224cb3b9cd55905201cd1b55a03f2736e9 Merge: 987e12a58 1e46a391b Author: Nick Mathewson Date: Fri Sep 7 09:15:52 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27344| 4 configure.ac| 1 + src/common/tortls.c | 7 ++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --cc src/common/tortls.c index 03c0be1cd,1f2fe1ce1..6efc8c3e4 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@@ -1171,7 -1129,12 +1171,13 @@@ tor_tls_context_new(crypto_pk_t *identi #else if (!(result->ctx = SSL_CTX_new(SSLv23_method( goto error; -#endif +#endif /* defined(HAVE_TLS_METHOD) */ ++ + #ifdef HAVE_SSL_CTX_SET_SECURITY_LEVEL + /* Level 1 re-enables RSA1024 and DH1024 for compatibility with old tors */ + SSL_CTX_set_security_level(result->ctx, 1); + #endif + SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv2); SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 987e12a58f6ce9e0001413e665ac2aa92869af77 Merge: eacaff6cc 9fcb3ef78 Author: Nick Mathewson Date: Fri Sep 7 08:46:45 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit a5ed62f96cafa1be251f9a7b4aafa519de4c2645 Merge: a08e6e711 912ae2b8d Author: Nick Mathewson Date: Fri Sep 7 08:44:39 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 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/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit a08e6e711fbcd6a12818f1fe14739fc0e870434d Merge: 57b207efa 1570f17f9 Author: Nick Mathewson Date: Fri Sep 7 08:42:19 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 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/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 57b207efa42e0a2794457cc7aff9c662d9000b44 Merge: 2b1b8bf2c ff1486385 Author: Nick Mathewson Date: Wed Sep 5 10:15:42 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 .travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --cc .travis.yml index a64b5e61f,a323b4ecd..82eced41b --- a/.travis.yml +++ b/.travis.yml @@@ -169,8 -133,8 +169,8 @@@ install script: - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - - echo $CONFIGURE_FLAGS + - echo "Configure flags are $CONFIGURE_FLAGS" - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" ]]; then make check; fi ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 2b1b8bf2cad4af304d38f88e38047da7e0be Merge: b40f9967f 4e4b6a247 Author: Nick Mathewson Date: Wed Sep 5 09:56:19 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 .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/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit b40f9967fa31faa1dcf1a977989e235fbe836015 Merge: 70a07fa90 541b89b06 Author: Nick Mathewson Date: Wed Aug 29 11:17:31 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 Makefile.am | 3 ++- changes/bug27295 | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc Makefile.am index 4d2d9d222,e4be3f26f..34493765d --- a/Makefile.am +++ b/Makefile.am @@@ -143,10 -127,9 +144,10 @@@ test-network-all: need-chutney-path tes done; \ for f in $$flavors; do \ $(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file $(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file $(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) $(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \ + $(top_srcdir)/src/test/test-network.sh $(TEST_NETWORK_WARNING_FLAGS); \ done; \ echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)."; \ - ! grep -q FAIL test_network_log/*.trs + ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs need-stem-path: @if test ! -d "$$STEM_SOURCE_DIR"; then \ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 36bb11a65081bb0c2a2a86359c6386bde67f8046 Merge: c1ad40627 cc4ea34a2 Author: Nick Mathewson Date: Thu Aug 23 19:36:45 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27185 | 3 +++ src/test/test.c | 10 ++ 2 files changed, 5 insertions(+), 8 deletions(-) diff --cc src/test/test.c index 383bc,6330eb9b9..a935ac36a --- a/src/test/test.c +++ b/src/test/test.c @@@ -20,8 -20,10 +20,10 @@@ #include #else #include -#endif +#endif /* defined(_WIN32) */ + #include + /* These macros pull in declarations for some functions and structures that * are typically file-private. */ #define GEOIP_PRIVATE ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit c1ad40627bbccf2682f56053c77ff719c822cbce Merge: a5bbe3f1d 9068e2fa2 Author: Nick Mathewson Date: Wed Aug 22 09:37:31 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 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/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit a5bbe3f1d0d8162e70af01f6b3956412dcc75946 Merge: a29e9a901 05d62a3b7 Author: Nick Mathewson Date: Tue Aug 21 20:03:46 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit d52f406001082474c3decf04747bf6f742b82c96 Merge: c798957b5 85a879234 Author: Nick Mathewson Date: Tue Aug 21 19:16:40 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 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/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit a26a2735b9cf9c6940d784f755f983088c333833 Merge: 8982719f6 4c355ff18 Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 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/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 8982719f6ac06383c26283b60acf6b3d3fde613e Merge: 8e68fe7e1 fe19b40fe Author: Nick Mathewson Date: Thu Aug 9 08:47:24 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 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/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 8e68fe7e1c84e4ad513cd6b0af686a51c49e55cb Merge: 4856a6e6c 27a2a6cb9 Author: Nick Mathewson Date: Wed Aug 8 09:26:22 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 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/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 4856a6e6c4b352f04b98f7f77c70a0c33dc8c29c Merge: fea35ddf0 42c6ebda1 Author: Nick Mathewson Date: Fri Aug 3 07:33:45 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 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/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 78386d8cdd67ca9c00e77d5d8e6604c0841a7098 Merge: 559f79fd7 501deba8c Author: Nick Mathewson Date: Wed Jul 18 16:39:10 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 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/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 312a42fc854a732d5f0fe4d5dcc1f567c2e069f4 Merge: 78386d8cd 93da2cae4 Author: Nick Mathewson Date: Wed Jul 18 16:39:25 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 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/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 559f79fd79b7c22caac2888f82e92307be02904a
Merge: 61a2762e3 a321d7240
Author: Nick Mathewson
Date: Wed Jul 18 15:03:27 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
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/or/dirserv.h
index 46967a6cb,624cd7e0b..5f195442c
--- a/src/or/dirserv.h
+++ b/src/or/dirserv.h
@@@ -190,19 -140,4 +190,18 @@@ int dirserv_read_measured_bandwidths(co
int dirserv_read_guardfraction_file(const char *fname,
smartlist_t *vote_routerstatuses);
-#endif
+spooled_resource_t *spooled_resource_new(dir_spool_source_t source,
+ const uint8_t *digest,
+ size_t digestlen);
+spooled_resource_t *spooled_resource_new_from_cache_entry(
+ struct consensus_cache_entry_t *entry);
+void spooled_resource_free(spooled_resource_t *spooled);
+void dirserv_spool_remove_missing_and_guess_size(dir_connection_t *conn,
+ time_t cutoff,
+ int compression,
+ size_t *size_out,
+ int *n_expired_out);
+void dirserv_spool_sort(dir_connection_t *conn);
+void dir_conn_clear_spool(dir_connection_t *conn);
+
+#endif /* !defined(TOR_DIRSERV_H) */
-
diff --cc src/test/test_dir.c
index b21ce5048,4cdbfb4f8..28489d939
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@@ -6110,89 -5457,56 +6110,140 @@@ test_dir_assumed_flags(void *arg
}
static void
+test_dir_post_parsing(void *arg)
+{
+ (void) arg;
+
+ /* Test the version parsing from an HS descriptor publish request. */
+ {
+const char *end;
+const char *prefix = "/tor/hs/";
+int version = parse_hs_version_from_post("/tor/hs//publish", prefix,
);
+tt_int_op(version, OP_EQ, -1);
+tt_ptr_op(end, OP_EQ, NULL);
+version = parse_hs_version_from_post("/tor/hs/a/publish", prefix, );
+tt_int_op(version, OP_EQ, -1);
+tt_ptr_op(end, OP_EQ, NULL);
+version = parse_hs_version_from_post("/tor/hs/3/publish", prefix, );
+tt_int_op(version, OP_EQ, 3);
+tt_str_op(end, OP_EQ, "/publish");
+version = parse_hs_version_from_post("/tor/hs/42/publish", prefix, );
+tt_int_op(version, OP_EQ, 42);
+tt_str_op(end, OP_EQ, "/publish");
+version = parse_hs_version_from_post("/tor/hs/18163/publish",prefix,
);
+tt_int_op(version, OP_EQ, 18163);
+tt_str_op(end, OP_EQ, "/publish");
+version = parse_hs_version_from_post("JUNKJUNKJUNK", prefix, );
+tt_int_op(version, OP_EQ, -1);
+tt_ptr_op(end, OP_EQ, NULL);
+version = parse_hs_version_from_post("/tor/hs/3/publish", "blah", );
+tt_int_op(version, OP_EQ, -1);
+tt_ptr_op(end, OP_EQ, NULL);
+/* Missing the '/' at the end of the prefix. */
+version = parse_hs_version_from_post("/tor/hs/3/publish", "/tor/hs",
);
+tt_int_op(version, OP_EQ, -1);
+tt_ptr_op(end, OP_EQ, NULL);
+version = parse_hs_version_from_post("/random/blah/tor/hs/3/publish",
+ prefix, );
+tt_int_op(version, OP_EQ, -1);
+tt_ptr_op(end, OP_EQ, NULL);
+version = parse_hs_version_from_post("/tor/hs/3/publish/random/junk",
+ prefix, );
+tt_int_op(version, OP_EQ, 3);
+tt_str_op(end, OP_EQ, "/publish/random/junk");
+version = parse_hs_version_from_post("/tor/hs/-1/publish", prefix, );
+tt_int_op(version, OP_EQ, -1);
+tt_ptr_op(end, OP_EQ, NULL);
+/* INT_MAX */
+version = parse_hs_version_from_post("/tor/hs/2147483647/publish",
+ prefix, );
+tt_int_op(version, OP_EQ, INT_MAX);
+tt_str_op(end, OP_EQ, "/publish");
+/* INT_MAX + 1*/
+version = parse_hs_version_from_post("/tor/hs/2147483648/publish",
+ prefix, );
+tt_int_op(version, OP_EQ, -1);
+tt_ptr_op(end, OP_EQ, NULL);
+ }
+
+ done:
+ ;
+}
+
+static void
+test_dir_platform_str(void *arg)
+{
+ char platform[256];
+ (void)arg;
+ platform[0] = 0;
+ get_platform_str(platform, sizeof(platform));
+ tt_int_op((int)strlen(platform), OP_GT, 0);
+ tt_assert(!strcmpstart(platform, "Tor "));
+
+ tor_version_t ver;
+ // make sure this is a tor version, a real actual tor version.
+ tt_int_op(tor_version_parse_platform(platform, , 1), OP_EQ, 1);
+
+ TT_BLATHER(("%d.%d.%d.%d", ver.major, ver.minor, ver.micro,
ver.patchlevel));
+
+ // Handle an example
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 61a2762e353f29b8b4402bf068e6268809174702 Merge: 98ee23ca1 6dafddd05 Author: Nick Mathewson Date: Tue Jul 17 14:56:52 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 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/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 98ee23ca1e09cb6ac9e4b8e4bca67557ebb69906 Merge: 6ad2c2b92 cd4795ca3 Author: Nick Mathewson Date: Thu Jul 12 14:32:16 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 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/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit 4a604d99382e4aad3df257e265c852f306f7bc7f Merge: d3894dc34 8b53dfc36 Author: Nick Mathewson Date: Mon Jul 9 10:14:43 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 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/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit d3894dc34b66fc5090b674ff850071aaf319d1c8 Merge: a4e8f9450 9faa28b60 Author: Nick Mathewson Date: Mon Jul 9 09:11:41 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 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/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit a4e8f945077b8eebbbd5be85f89b1631305ce1cc Merge: e6366f787 b205714ba Author: Nick Mathewson Date: Tue Jul 3 09:48:03 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug26535.029 | 5 + src/test/ntor_ref.py | 9 ++--- 2 files changed, 11 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
