[tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0
commit f3fa22bf1b52dfce65a37e6a84bac8635916e8c2 Merge: 65825018c 2b6df3da2 Author: Nick Mathewson Date: Mon Feb 10 14:17:09 2020 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket33212 | 4 src/rust/protover/protover.rs | 2 +- 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.5' into maint-0.4.0
commit 65825018c7aed931324dd427bb1e84544a9b2f47 Merge: 026f068bb 41d52e9cd Author: teor Date: Thu Jan 30 07:54:58 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40 ++-- 2 files changed, 10 insertions(+), 38 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.5' into maint-0.4.0
commit 026f068bb3aed9de0f1cc6792f6c9528b7b27db2 Merge: d96b35d66 19954cffd Author: teor Date: Thu Jan 16 10:00:32 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 src/lib/evloop/compat_libevent.c | 10 ++ src/lib/evloop/compat_libevent.h | 3 +++ 4 files changed, 21 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.5' into maint-0.4.0
commit 748117298341de8a279f4437b6d557f0d50edb63 Merge: b9504f788 1cd20ff84 Author: teor Date: Mon Dec 16 08:16:04 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 9 + changes/ticket32177 | 3 --- changes/ticket32629 | 4 3 files changed, 9 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.5' into maint-0.4.0
commit 651d29c0f7b7b5dadd4f56a9b1a937ddc34641f8 Merge: c7ca3fc18 0c4f0ec97 Author: Nick Mathewson Date: Mon Dec 9 16:01:22 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 "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.5' into maint-0.4.0
commit c7ca3fc1869f4999845526d7fd883e17630143e9 Merge: e66533bef 74cae547e Author: Nick Mathewson Date: Fri Dec 6 16:02:07 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/geoip-2019-12-03 | 4 + src/config/geoip | 13933 ++--- src/config/geoip6| 4621 --- 3 files changed, 10717 insertions(+), 7841 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.5' into maint-0.4.0
commit 371d7dbc1a1c8e4cacd80641066d01ba54be197e Merge: 92fb09906 c53567c36 Author: Nick Mathewson Date: Thu Dec 5 13:30:32 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 "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.5' into maint-0.4.0
commit 92fb0990675424cd04eb0b39b4ae157ac7f5385b Merge: 46057ec5a aee966cb0 Author: teor Date: Thu Dec 5 10:13:53 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug31571| 7 +++ src/lib/err/backtrace.c | 42 +++--- src/lib/err/backtrace.h | 1 + src/lib/err/torerr.c| 11 +-- 4 files changed, 48 insertions(+), 13 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.5' into maint-0.4.0
commit febbc236d4a813bf086c5cc3dcd0fa93c7f3eab1 Merge: 055f5d4d1 62cf12a8b Author: teor Date: Tue Dec 3 12:46:43 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 14 +- changes/ticket32500 | 5 + 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.5' into maint-0.4.0
commit 055f5d4d1b2c8ea5a85691f7110e82a9c468b6dd Merge: c17ab20ac 501b5174d Author: teor Date: Mon Nov 25 12:36:59 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug30344 | 4 changes/bug31939 | 3 +++ changes/ticket28970| 6 ++ changes/ticket31548| 7 +++ changes/ticket32058| 5 + src/core/mainloop/connection.c | 18 -- src/core/mainloop/mainloop.c | 10 ++ src/core/mainloop/periodic.c | 5 + src/feature/hs/hs_client.c | 8 ++-- src/feature/hs/hs_service.c| 9 + src/lib/tls/buffers_tls.c | 4 ++-- 11 files changed, 69 insertions(+), 10 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.5' into maint-0.4.0
commit 329aa1c48ef838bd0ef0e83d829f1a6533b8f77f Merge: 29940511e 7beaaed24 Author: Nick Mathewson Date: Mon Nov 11 10:14:03 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.5' into maint-0.4.0
commit 29940511e3c431a2c62a3844c6b12a039eaed521 Merge: 03e77ef03 2abff832d Author: teor Date: Mon Nov 11 14:19:39 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .appveyor.yml| 2 +- changes/bug32449 | 5 + 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.5' into maint-0.4.0
commit 03e77ef036e41486b8bfe138d11790c928f49f35 Merge: 54e2d0dc2 1bde356bf Author: teor Date: Wed Nov 6 11:19:38 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug30916 | 4 +++ changes/bug31107 | 4 +++ changes/bug31408 | 5 changes/bug31837 | 5 changes/ticket31466 | 5 src/core/or/channeltls.c | 10 ++- src/core/or/connection_edge.c | 6 ++-- src/feature/relay/router.c| 18 +--- src/lib/fs/conffile.c | 10 --- src/test/test_config.c| 68 +++ src/test/test_rebind.py | 16 +- 11 files changed, 127 insertions(+), 24 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.5' into maint-0.4.0
commit 54e2d0dc2d790a9e84ec44db2d53d535d8076602 Merge: e56e7e865 15d67842f Author: teor Date: Tue Oct 29 08:26:40 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 7 --- changes/ticket32241 | 2 ++ 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.5' into maint-0.4.0
commit e56e7e865e148c5017ae20df12c76df0f79e60c1 Merge: 57acdaa3f e03db9934 Author: teor Date: Fri Oct 25 10:55:58 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml| 12 ++-- changes/ticket31919_bionic | 5 + 2 files changed, 15 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.5' into maint-0.4.0
commit 57acdaa3f14db52efb5e9ae2be3e54ddbf17bad9 Merge: 641f13044 d175e7081 Author: teor Date: Wed Oct 23 08:47:08 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug12399 | 3 +++ changes/bug23507 | 5 + changes/bug23818_v2| 6 ++ changes/bug23818_v3| 6 ++ src/feature/hs/hs_circuit.c| 28 ++-- src/feature/hs/hs_circuit.h| 3 ++- src/feature/hs/hs_service.c| 30 +++--- src/feature/rend/rendmid.c | 3 ++- src/feature/rend/rendservice.c | 19 +++ 9 files changed, 84 insertions(+), 19 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.5' into maint-0.4.0
commit 4013e50cb732bfb3e2706baef5cd7aba8d16d8c4 Merge: 9bb0ca122 21c3488af Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 .appveyor.yml| 12 changes/bug31884 | 3 +++ 2 files changed, 15 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.5' into maint-0.4.0
commit 9bb0ca122f13255982566b440b0b9d03b6a9e44b Merge: 89ead08ee bed439013 Author: teor Date: Tue Oct 22 20:48:05 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 12 +++- changes/ticket32177 | 3 +++ 2 files changed, 10 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.5' into maint-0.4.0
commit 89ead08eefbb2ab4201bc8286afcf99b1286bafc Merge: e483257e1 f420b60c1 Author: Nick Mathewson Date: Mon Oct 21 18:44:44 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 .appveyor.yml | 8 changes/ticket32086 | 3 +++ 2 files changed, 7 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.5' into maint-0.4.0
commit e483257e1bc826b5678fcbf13084fd5d811f2b12 Merge: a74c18069 4b8e5ea0d Author: teor Date: Thu Oct 17 14:51:58 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 87 +++-- changes/ticket30860 | 3 ++ changes/ticket31859 | 3 ++ 3 files changed, 43 insertions(+), 50 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.5' into maint-0.4.0
commit a74c18069199763a45fa636d6748d22c4fe98eeb Merge: 9e674d0eb 7b9cb4c47 Author: Nick Mathewson Date: Wed Oct 2 08:01:34 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/geoip-2019-10-01 | 4 + src/config/geoip | 35299 ++--- src/config/geoip6| 8318 --- 3 files changed, 26359 insertions(+), 17262 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.5' into maint-0.4.0
commit 9e674d0eb4d83caab5298e83c837ebd58b0f5d3d Merge: a1f97bb25 02840169d Author: Nick Mathewson Date: Tue Sep 17 21:28:37 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug31657| 5 + src/feature/client/entrynodes.c | 3 ++- src/test/test_entrynodes.c | 3 ++- 3 files changed, 9 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.5' into maint-0.4.0
commit a1f97bb25301811aa8dab7b250fb38918cee9332 Merge: ef3543558 50b45c43e Author: Nick Mathewson Date: Tue Sep 17 21:26:31 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177 +++- 2 files changed, 176 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.5' into maint-0.4.0
commit ef35435584c529906d385b0ce532aa6e43205608 Merge: 34bab120d dc41e6a80 Author: Nick Mathewson Date: Tue Sep 17 18:58:43 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 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.5' into maint-0.4.0
commit 896a1ac50b6ab182c1e15cc5271d0b24fcb90a31 Merge: 1203e137b 046183714 Author: teor Date: Thu Sep 5 14:47:54 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 Makefile.am | 2 +- changes/ticket31554 | 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.5' into maint-0.4.0
commit a52a5e0099f9201e0dc1a358b1ac7721070caf56 Merge: 357e9a6f2 1132dc9f7 Author: teor Date: Fri Aug 30 23:33:01 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug30894 | 4 changes/bug31003 | 4 changes/ticket30871 | 6 + src/app/config/confparse.c| 1 + src/feature/client/entrynodes.c | 4 src/feature/nodelist/routerlist.c | 12 +- src/test/test_circuitbuild.c | 47 +++ 7 files changed, 72 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.5' into maint-0.4.0
commit 357e9a6f2c88b99e85e65c0401c524adbe921665 Merge: 90f4ed233 190386f1c Author: George Kadianakis Date: Tue Aug 27 11:49:36 2019 +0300 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 2 +- changes/bug31463 | 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.5' into maint-0.4.0
commit 90f4ed2335fee8bba6e232c6d92078cb133f5b9e Merge: 20943d00f 5653b93a1 Author: Nick Mathewson Date: Mon Aug 19 10:37:21 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket31406 | 3 +++ src/app/config/auth_dirs.inc | 2 +- 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.5' into maint-0.4.0
commit 20943d00f10af11133d9ece90f1cbed658a21aed Merge: a1d8409ee d253b31ce Author: teor Date: Mon Aug 12 13:10:05 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug22619 | 3 +++ changes/bug29034 | 5 + changes/bug29670 | 4 changes/bug29875 | 11 +++ changes/bug30148 | 4 changes/bug30190 | 3 +++ changes/ticket29617| 4 src/app/config/config.c| 5 +++-- src/core/mainloop/connection.c | 33 + src/core/or/circuituse.c | 6 ++ src/feature/client/entrynodes.c| 3 +++ src/feature/relay/dns.c| 3 ++- src/feature/relay/routerkeys.c | 2 +- src/lib/crypt_ops/crypto_openssl_mgt.c | 8 src/test/test_config.c | 12 +--- 15 files changed, 83 insertions(+), 23 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.5' into maint-0.4.0
commit bad00108087c4c34e34966fdeb01ae1e8bb14666 Merge: 8a4635a5f 5df0b3662 Author: teor Date: Sat Aug 10 07:26:21 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug30561| 6 ++ src/lib/string/printf.c | 16 +--- 2 files changed, 19 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.5' into maint-0.4.0
commit e27a74b1b12f08f0f9556e906675a4d2ebc07c50 Merge: 97e7be271 1bc2ae7be Author: teor Date: Thu Aug 8 11:11:27 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.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.5' into maint-0.4.0
commit 0a661cde1d553116937ff4ea9ac09dbc631d7432 Merge: e27a74b1b e83eabc9b Author: teor Date: Thu Aug 8 11:19:38 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 8 +--- changes/ticket30591 | 3 +++ changes/ticket30694 | 3 +++ 3 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
[tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0
commit 2a42d6be2707bbc28ad9d68055799297d1d07daf Merge: afa2c39ba 1dd952789 Author: Nick Mathewson Date: Mon Jul 1 14:25:12 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket28795 | 5 + src/app/config/fallback_dirs.inc | 567 ++- 2 files changed, 266 insertions(+), 306 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.5' into maint-0.4.0
commit afa2c39baa61777b7f5bdfed28efe2ac5087dc4b Merge: 4ca18fde9 b0fa1f4fb Author: Nick Mathewson Date: Tue Jun 11 10:17:18 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/geoip-2019-06-10 | 4 + src/config/geoip | 14985 + src/config/geoip6| 2391 ++-- 3 files changed, 9920 insertions(+), 7460 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.5' into maint-0.4.0
commit 4ca18fde93642976da326e207e62791780aad56f Merge: c8447f95e dcb8cad4e Author: teor Date: Tue Jun 11 14:52:27 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.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.5' into maint-0.4.0
commit c7f9f7e5426b473a505063904116760c7fae7e11 Merge: 7e3f7ab40 e5deb2bbc Author: Nick Mathewson Date: Fri May 17 08:10:16 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/geoip-2019-05-13 | 4 + src/config/geoip | 15407 ++--- src/config/geoip6| 3771 +++ 3 files changed, 11335 insertions(+), 7847 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.5' into maint-0.4.0
commit 7e3f7ab4060531c28ebf3f544f4ec5196e0424ec Merge: cd264e145 6945f2b3e Author: Nick Mathewson Date: Wed May 15 07:41:42 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.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.5' into maint-0.4.0
commit 24b68b4777225436c1f5f820e79a6a76ee973313 Merge: 6a179b107 231036a11 Author: teor Date: Fri Apr 19 12:00:50 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.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.5' into maint-0.4.0
commit c72f0cd5c77ffceb6f0275295c3446a908b17a75 Merge: 15591e1bb 8ff6ab0a3 Author: teor Date: Wed Apr 17 16:46:40 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 2 +- changes/ticket30117 | 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.5' into maint-0.4.0
commit 8b3b605a1529e34eb42926db7c38d046a3f1bacb Merge: 071a000d6 3b9e3cca9 Author: teor Date: Sat Apr 6 09:33:28 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.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.5' into maint-0.4.0
commit de76862fd6177acd8c5b801af4df73bfab5d98ac Merge: 9242f3288 4aa02d3c7 Author: Nick Mathewson Date: Wed Apr 3 09:27:44 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/geoip-2019-04-02 | 4 + src/config/geoip | 10355 + src/config/geoip6| 2337 ++ 3 files changed, 7344 insertions(+), 5352 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.5' into maint-0.4.0
commit 9242f32883e2eff53ddc8217255168e91c6e3e7f Merge: 6d188fb4c 0418d4081 Author: teor Date: Tue Apr 2 11:45:31 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug29703 | 4 1 file 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.5' into maint-0.4.0
commit ca29cb397b619252a3d07d6f371313f10d8fb23f Merge: 9ae8d663e 3280e9a11 Author: teor Date: Wed Mar 27 10:02:47 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.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.5' into maint-0.4.0
commit 3871fb732ddd07d48a9d449c09e7b42d25a87727 Merge: de5ab1ef4 41cd05562 Author: teor Date: Wed Mar 20 09:48:12 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.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.5' into maint-0.4.0
commit b4483edce03be334ac320b812bfeae3bc2d5ee6b Merge: 1547fd99a 17e3eea68 Author: teor Date: Tue Mar 19 15:43:33 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug29530_035 | 5 + 1 file 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.5' into maint-0.4.0
commit feb7253df316ee1ec9c2ec3e33aac312da4d1f02 Merge: ec2a2a6b7 5d41e2223 Author: teor Date: Thu Mar 14 07:00:43 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.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.5' into maint-0.4.0
commit 968d2b87cb035e1113fecf58e7c7c2432efcaea2 Merge: 3af943dcd ffd720702 Author: teor Date: Fri Mar 8 14:11:46 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.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.5' into maint-0.4.0
commit 9b4ecbaa7d5a19c2ddbb5e2c442e19c248930a7b Merge: a999cb43d d6f77b99d Author: Nick Mathewson Date: Wed Mar 6 14:29:43 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/geoip-2019-03-04 | 4 + src/config/geoip | 12163 - src/config/geoip6| 2251 ++--- 3 files changed, 8221 insertions(+), 6197 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.5' into maint-0.4.0
commit 955a622391192ff9cb65dddcb110532616f890ff Merge: dc19d65c3 1c248fa27 Author: teor Date: Fri Mar 1 14:17:31 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.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.5' into maint-0.4.0
commit aef6e61347f45087305871f356891ddd959d7081 Merge: 90c8956e2 de0969ef7 Author: teor Date: Thu Feb 28 10:49:47 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.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.5' into maint-0.4.0
commit 90c8956e2161174ea4d344e17c79855c14acdeb8 Merge: 56f01e58b be29dfedd Author: teor Date: Thu Feb 28 10:46:14 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.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.5' into maint-0.4.0
commit ef2925e742d35be6558c1223fd4718077138cca9 Merge: a5dd41b9a 15dc33849 Author: teor Date: Wed Feb 27 09:38:19 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.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.5' into maint-0.4.0
commit 4746e1261b403302852e3107a986e663d2b063c1 Merge: 9c4ec414b 1216f9953 Author: David Goulet Date: Tue Feb 26 10:48:12 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.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.5' into maint-0.4.0
commit 5f44e1e5dc9a624d36e622bb943390f627b83867 Merge: 00a93b19c 955ca72f9 Author: Nick Mathewson Date: Thu Feb 21 13:25:02 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 "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.5' into maint-0.4.0
commit 00a93b19cf0db9c0f47a48d55c658058f976ab93 Merge: df3484b2b 4a8a1f76e Author: Nick Mathewson Date: Thu Feb 21 10:08:14 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket29168 | 5 + src/core/or/scheduler_kist.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.5' into maint-0.4.0
commit 332fe156798ff8346bb22f9377103e2c12e758a4 Merge: 34183f0d7 c663716b6 Author: Nick Mathewson Date: Thu Feb 21 09:51:38 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 "ours" to avoid version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
