[tor-commits] [chutney/master] Merge remote-tracking branch 'asn-d6/bug33842'

2020-05-14 Thread teor
commit bb4e5f6182b83d372d48b65e917e66935319133c Merge: b3d6889 2a96dfa Author: teor Date: Fri May 15 11:34:49 2020 +1000 Merge remote-tracking branch 'asn-d6/bug33842' networks/hs-ob-v3 | 15 +++ 1 file changed, 15 insertions

[tor-commits] [chutney/master] Add network template for OBv3 testing.

2020-05-14 Thread teor
commit 2a96dfaf33e460cb141091f684f185e5b4cf33c5 Author: George Kadianakis Date: Wed Apr 8 16:42:49 2020 +0300 Add network template for OBv3 testing. --- networks/hs-ob-v3 | 15 +++ 1 file changed, 15 insertions(+) diff --git a/networks/hs-ob-v3 b/networks/hs-ob-v3 new file

[tor-commits] [torspec/master] Prop 311: Make self-tests slightly stricter

2020-05-07 Thread teor
commit 00d67ace14282f14812a86e6d1123a4f2ce690c3 Author: teor Date: Fri May 8 09:40:36 2020 +1000 Prop 311: Make self-tests slightly stricter Ignore create cells from clients when checking for relay reachability. Part of 33222. --- proposals/311-relay-ipv6

[tor-commits] [torspec/master] Prop 311: Say "port forwarding" for clarity

2020-05-01 Thread teor
commit d6e18ebe538df66b372b4ebd56fdadff5119186c Author: teor Date: Fri May 1 17:23:44 2020 +1000 Prop 311: Say "port forwarding" for clarity --- proposals/311-relay-ipv6-reachability.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/proposals/311-

[tor-commits] [torspec/master] Prop 311: Another reachability edge case

2020-05-01 Thread teor
commit 40486e0b5eed4006b9895f85424c0ad9c0d33eb8 Author: teor Date: Fri May 1 17:14:37 2020 +1000 Prop 311: Another reachability edge case Part of 33222. --- proposals/311-relay-ipv6-reachability.txt | 20 +--- 1 file changed, 17 insertions(+), 3 deletions(-) diff

[tor-commits] [tor/master] Merge branch 'pr1870_squashed'

2020-04-30 Thread teor
commit 6dc9930d3a14c30af0f285a884476f33a782938c Merge: efcae919a 7bf257b12 Author: teor Date: Thu Apr 30 22:22:09 2020 +1000 Merge branch 'pr1870_squashed' changes/ticket33956 | 5 + src/core/or/channeltls.c | 10 +++--- src/lib/net/address.c| 3 +-- src/lib/net

[tor-commits] [tor/master] Define and use TOR_ADDRPORT_BUF_LEN

2020-04-30 Thread teor
commit 7bf257b1297d146047d10e0d527b45a88abf892a Author: Neel Chauhan Date: Sun Apr 26 13:06:11 2020 -0700 Define and use TOR_ADDRPORT_BUF_LEN --- changes/ticket33956 | 5 + src/core/or/channeltls.c | 10 +++--- src/lib/net/address.c| 3 +-- src/lib/net/address.h| 9

[tor-commits] [tor/master] practracker: Accept the connection buf refactor

2020-04-29 Thread teor
commit efcae919aea4611d9f4ec5815170c48fc67134cf Author: teor Date: Thu Apr 30 13:55:26 2020 +1000 practracker: Accept the connection buf refactor Accept a few extra lines from the connection_buf_read_from_socket() refactor. Cleanup after 33131. --- scripts/maint

[tor-commits] [tor/master] relay: Fix a comment typo in the selftest.c header

2020-04-29 Thread teor
commit 3eca667ae4ab7dfd4d6f87858808b2775ffb1340 Author: teor Date: Thu Apr 30 13:54:40 2020 +1000 relay: Fix a comment typo in the selftest.c header --- src/feature/relay/selftest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/feature/relay/selftest.c b/src

[tor-commits] [tor/master] Run "make autostyle"

2020-04-29 Thread teor
commit 3253c357eeae3434da62bf720a451aa19f0ddd32 Author: teor Date: Wed Apr 29 22:07:35 2020 +1000 Run "make autostyle" --- src/feature/dircache/conscache.c | 2 +- src/feature/hs/hs_opts_st.h| 2 +- src/lib/crypt_ops/crypto_rsa_openssl.c | 8 src/

[tor-commits] [tor/master] nodelist: Remove an outdated comment

2020-04-29 Thread teor
commit 398e0e02474b988fd8600117eaece182a295b546 Author: teor Date: Wed Apr 29 15:53:27 2020 +1000 nodelist: Remove an outdated comment Part of 33817. --- src/feature/nodelist/routerinfo_st.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/feature/nodelist

[tor-commits] [tor/master] rand: Clarify the crypto_rand_uint() range

2020-04-29 Thread teor
commit 6eec43161ad9e072d82da88163e748566b39d127 Author: teor Date: Wed Apr 29 15:57:44 2020 +1000 rand: Clarify the crypto_rand_uint() range --- src/lib/crypt_ops/crypto_rand_numeric.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/crypt_ops

[tor-commits] [tor/master] channeltls: Clarify a relay impersonation defence

2020-04-28 Thread teor
commit 7517e1b5d31aada1f594c2594737a231d9d8e116 Author: teor Date: Tue Apr 28 21:11:10 2020 +1000 channeltls: Clarify a relay impersonation defence Clarify the comments in channel_tls_matches_target_method(), and make it clear that the attack is a covert attack. --- src/core

[tor-commits] [torspec/master] tor-spec: Do the same extend checks as tor

2020-04-28 Thread teor
commit b43b9156614596e73df63be69ee439be93444802 Author: teor Date: Tue Apr 28 21:07:24 2020 +1000 tor-spec: Do the same extend checks as tor Update the extend checks to match tor's implementation, particularly the comments in channel_tls_matches_target_method(). --- tor

[tor-commits] [torspec/master] tor-spec: Explain the truncated reason better

2020-04-28 Thread teor
commit 79fba6de64025991da4aac402d0b7f69493105d8 Author: teor Date: Tue Apr 28 17:34:15 2020 +1000 tor-spec: Explain the truncated reason better It's the payload of a DESTROY cell, but the data of a RELAY_TRUNCATED cell. --- tor-spec.txt | 11 ++- 1 file changed, 6

[tor-commits] [torspec/master] tor-spec: Extends accept all-zero ed25519 keys

2020-04-28 Thread teor
commit ce0d233f6d834be8a2fd2a10b2791978b90c1df1 Author: teor Date: Tue Apr 28 17:30:30 2020 +1000 tor-spec: Extends accept all-zero ed25519 keys The spec gives conficting advice about all-zero ed25519 keys in extends. Resolve this conflict by documenting tor's current

[tor-commits] [torspec/master] Prop 311: Add design for reachability circuits

2020-04-27 Thread teor
commit f12126bd8ab9a8068aacc015edc085286dd587a9 Author: teor Date: Tue Apr 28 13:40:30 2020 +1000 Prop 311: Add design for reachability circuits Update 4.2.3. Separate IPv4 and IPv6 Reachability Flags. Add a detailed design for checking cells on reachability self-test

[tor-commits] [torspec/master] Prop 312: Clarify torrc Address option

2020-04-27 Thread teor
commit 2e67ae1c70436b949f5d23a67ba24a03b845defc Author: teor Date: Tue Apr 28 13:20:11 2020 +1000 Prop 312: Clarify torrc Address option Clarify section 3.2.1. Make the Address torrc Option Support IPv6. The list of possible configurations was incorrect. --- proposals

[tor-commits] [tor/master] test/channel: Fix a comment typo

2020-04-15 Thread teor
commit e3b1e617ae4850280012c95f40e54acdfc897855 Author: teor Date: Wed Apr 15 19:45:56 2020 +1000 test/channel: Fix a comment typo --- src/test/test_channel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_channel.c b/src/test/test_channel.c index

[tor-commits] [chutney/master] TorNet: Rename pid files after tor exits

2020-04-15 Thread teor
commit 6282f471e432efa2aadf1046ea6e0fbaca17b434 Author: teor Date: Thu Apr 2 19:46:26 2020 +1000 TorNet: Rename pid files after tor exits Avoids race conditions where chutney tells tor to exit twice. And where chutney tells unrelated processes to exit. Part of 33793

[tor-commits] [chutney/master] TorNet: Wait slightly longer for tor to exit

2020-04-15 Thread teor
commit 983da388243dad70855892b093590adc9ae9ed08 Author: teor Date: Thu Apr 2 19:32:23 2020 +1000 TorNet: Wait slightly longer for tor to exit After stopping, it can take a little while for tor to cleanup. Wait a few extra seconds, to avoid race conditions. Part

[tor-commits] [chutney/master] TorNet: Improve some nodes path comments

2020-04-15 Thread teor
commit a9dc45fd151513aa7374cea929c51cf774a0b9e2 Author: teor Date: Thu Apr 2 19:31:38 2020 +1000 TorNet: Improve some nodes path comments --- lib/chutney/TorNet.py | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py

[tor-commits] [tor/master] Run practracker regen

2020-04-13 Thread teor
commit f5c34d340dba47244eac3e5bcb4dda43ffc0fc4b Author: teor Date: Tue Apr 14 15:42:52 2020 +1000 Run practracker regen Lock-in improvements. Accept some small function size increases. Allow a small amount of extra file size increase. --- scripts/maint/practracker

[tor-commits] [tor/master] core/or: Update file comment in connection_or.c

2020-04-13 Thread teor
commit a2daca594baa8439f7f9ee1d93073373454e20ed Author: teor Date: Tue Apr 14 14:55:37 2020 +1000 core/or: Update file comment in connection_or.c Fix a typo, and say "v3 (and later) handshake". Comment-only change. --- src/core/or/connection_or.c | 3 ++- 1 fi

[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2

2020-04-09 Thread teor
commit 71e72ce9caa5e7ed07f475a8ed1b40fce46c86d5 Merge: 958f6eb5c 2d34d4d1a Author: teor Date: Thu Apr 9 19:43:24 2020 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___ tor

[tor-commits] [tor/release-0.4.2] remove practracker from check-local (0.4.2 and 0.4.3 only)

2020-04-09 Thread teor
commit 2d34d4d1af5395885780ee96fbedb0bf17fb0f44 Author: Nick Mathewson Date: Wed Jun 19 14:29:08 2019 -0400 remove practracker from check-local (0.4.2 and 0.4.3 only) practracker shouldn't be running in release or maint branches. --- Makefile.am | 2 +- 1 file changed, 1

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3

2020-04-09 Thread teor
commit c502ce0762e1680503f6e6dc64c82852ccd19738 Merge: 456337a8d 1ae0839ef Author: teor Date: Thu Apr 9 19:43:28 2020 +1000 Merge branch 'maint-0.4.3' into release-0.4.3 Makefile.am | 1 - 1 file changed, 1 deletion(-) ___ tor-commits mailing

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-04-09 Thread teor
commit 1ae0839ef24d303f77cec165df5223a66131567c Merge: f6efb3a18 2d34d4d1a Author: teor Date: Thu Apr 9 19:41:19 2020 +1000 Merge branch 'maint-0.4.2' into maint-0.4.3 Remove check-best-practices from check-local in maint-0.4.3. (The check-local jobs are all on separate lines

[tor-commits] [tor/release-0.4.3] remove practracker from check-local (0.4.2 and 0.4.3 only)

2020-04-09 Thread teor
commit 2d34d4d1af5395885780ee96fbedb0bf17fb0f44 Author: Nick Mathewson Date: Wed Jun 19 14:29:08 2019 -0400 remove practracker from check-local (0.4.2 and 0.4.3 only) practracker shouldn't be running in release or maint branches. --- Makefile.am | 2 +- 1 file changed, 1

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-04-09 Thread teor
commit 1ae0839ef24d303f77cec165df5223a66131567c Merge: f6efb3a18 2d34d4d1a Author: teor Date: Thu Apr 9 19:41:19 2020 +1000 Merge branch 'maint-0.4.2' into maint-0.4.3 Remove check-best-practices from check-local in maint-0.4.3. (The check-local jobs are all on separate lines

[tor-commits] [tor/maint-0.4.3] remove practracker from check-local (0.4.2 and 0.4.3 only)

2020-04-09 Thread teor
commit 2d34d4d1af5395885780ee96fbedb0bf17fb0f44 Author: Nick Mathewson Date: Wed Jun 19 14:29:08 2019 -0400 remove practracker from check-local (0.4.2 and 0.4.3 only) practracker shouldn't be running in release or maint branches. --- Makefile.am | 2 +- 1 file changed, 1

[tor-commits] [tor/maint-0.4.2] remove practracker from check-local (0.4.2 and 0.4.3 only)

2020-04-09 Thread teor
commit 2d34d4d1af5395885780ee96fbedb0bf17fb0f44 Author: Nick Mathewson Date: Wed Jun 19 14:29:08 2019 -0400 remove practracker from check-local (0.4.2 and 0.4.3 only) practracker shouldn't be running in release or maint branches. --- Makefile.am | 2 +- 1 file changed, 1

[tor-commits] [tor/master] Merge branch 'maint-0.4.3'

2020-04-09 Thread teor
commit f431b78465ca8f1339598aa81b85300528c29de3 Merge: 4e3a17fac 1ae0839ef Author: teor Date: Thu Apr 9 19:42:36 2020 +1000 Merge branch 'maint-0.4.3' "ours" merge, because we only want to remove check-best-practices from check-local in 0.4.2

[tor-commits] [tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-04-09 Thread teor
commit 1ae0839ef24d303f77cec165df5223a66131567c Merge: f6efb3a18 2d34d4d1a Author: teor Date: Thu Apr 9 19:41:19 2020 +1000 Merge branch 'maint-0.4.2' into maint-0.4.3 Remove check-best-practices from check-local in maint-0.4.3. (The check-local jobs are all on separate lines

[tor-commits] [tor/master] remove practracker from check-local (0.4.2 and 0.4.3 only)

2020-04-09 Thread teor
commit 2d34d4d1af5395885780ee96fbedb0bf17fb0f44 Author: Nick Mathewson Date: Wed Jun 19 14:29:08 2019 -0400 remove practracker from check-local (0.4.2 and 0.4.3 only) practracker shouldn't be running in release or maint branches. --- Makefile.am | 2 +- 1 file changed, 1

[tor-commits] [tor/release-0.4.3] dos: Pass transport name on new client connection

2020-04-08 Thread teor
commit 894ff2dc8422cb86312c512698acd76476224f87 Author: David Goulet Date: Tue Mar 10 14:45:13 2020 -0400 dos: Pass transport name on new client connection For a bridge configured with a pluggable transport, the transport name is used, with the IP address, for the GeoIP client

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3

2020-04-08 Thread teor
commit 456337a8dd52085c4a8647ceb2b74f40fde20934 Merge: 72e4ed863 f6efb3a18 Author: teor Date: Thu Apr 9 11:07:47 2020 +1000 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket33804 | 7 +++ doc/tor.1.txt | 7 +++ src/app/config/config.c | 4 ++-- src/test

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.1

2020-04-08 Thread teor
commit 987f2fa50ac26af61917c7a6e13dc62f3ddb23ee Merge: 26fd31fef d380acaec Author: teor Date: Thu Apr 9 11:03:20 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.1 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h

[tor-commits] [tor/release-0.4.3] Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5

2020-04-08 Thread teor
commit d380acaecad5f554f7294cfcd7fbf100f9bbaca3 Merge: 38e07b88f 894ff2dc8 Author: teor Date: Thu Apr 9 11:02:49 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-04-08 Thread teor
commit 2d6f00e45b3003337242704e0fde2d2adbaa6cf5 Merge: 34faee060 2d7e08d57 Author: teor Date: Thu Apr 9 11:03:34 2020 +1000 Merge branch 'maint-0.4.2' into maint-0.4.3 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h

[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2

2020-04-08 Thread teor
commit 2d7e08d57ef5d3b785cfaa6961d6d3c73fe59535 Merge: 048714d2c 987f2fa50 Author: teor Date: Thu Apr 9 11:03:27 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h

[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2

2020-04-08 Thread teor
commit 958f6eb5c7b0f85197959970bd6bab5a54ecc30d Merge: c22601765 2d7e08d57 Author: teor Date: Thu Apr 9 11:03:30 2020 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h

[tor-commits] [tor/release-0.4.3] Merge branch 'pr1854_squashed' into maint-0.4.3

2020-04-08 Thread teor
commit f6efb3a184341b5b46c8a565e2ec297d2846e45c Merge: 2d6f00e45 cd2121a12 Author: teor Date: Thu Apr 9 11:05:59 2020 +1000 Merge branch 'pr1854_squashed' into maint-0.4.3 Squashed PR 1854, and fixed a minor typo (IPv4 -> IPv6). changes/ticket33804 | 7 +++ doc/tor.1.

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3

2020-04-08 Thread teor
commit 72e4ed86347a9426788265379befe8dd7be6b0d6 Merge: a985f554c 2d6f00e45 Author: teor Date: Thu Apr 9 11:03:37 2020 +1000 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h

[tor-commits] [tor/release-0.4.3] client: Revert setting PreferIPv6 on by default

2020-04-08 Thread teor
commit cd2121a1262c2d51b8b9174933db5c985f0ccc55 Author: David Goulet Date: Tue Apr 7 09:04:01 2020 -0400 client: Revert setting PreferIPv6 on by default This change broke torsocks that by default is expecting an IPv4 for hostname resolution because it can't ask tor for a

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.1' into maint-0.4.2

2020-04-08 Thread teor
commit 2d7e08d57ef5d3b785cfaa6961d6d3c73fe59535 Merge: 048714d2c 987f2fa50 Author: teor Date: Thu Apr 9 11:03:27 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h

[tor-commits] [tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5

2020-04-08 Thread teor
commit d380acaecad5f554f7294cfcd7fbf100f9bbaca3 Merge: 38e07b88f 894ff2dc8 Author: teor Date: Thu Apr 9 11:02:49 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4

[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.1

2020-04-08 Thread teor
commit 987f2fa50ac26af61917c7a6e13dc62f3ddb23ee Merge: 26fd31fef d380acaec Author: teor Date: Thu Apr 9 11:03:20 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.1 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

2020-04-08 Thread teor
commit 42ad044391224dec08b22237fa114a97b8c4c271 Merge: 8123ee15d d380acaec Author: teor Date: Thu Apr 9 11:03:15 2020 +1000 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h

[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1

2020-04-08 Thread teor
commit 987f2fa50ac26af61917c7a6e13dc62f3ddb23ee Merge: 26fd31fef d380acaec Author: teor Date: Thu Apr 9 11:03:20 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.1 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h

[tor-commits] [tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5

2020-04-08 Thread teor
commit d380acaecad5f554f7294cfcd7fbf100f9bbaca3 Merge: 38e07b88f 894ff2dc8 Author: teor Date: Thu Apr 9 11:02:49 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4

[tor-commits] [tor/maint-0.4.3] Merge branch 'pr1854_squashed' into maint-0.4.3

2020-04-08 Thread teor
commit f6efb3a184341b5b46c8a565e2ec297d2846e45c Merge: 2d6f00e45 cd2121a12 Author: teor Date: Thu Apr 9 11:05:59 2020 +1000 Merge branch 'pr1854_squashed' into maint-0.4.3 Squashed PR 1854, and fixed a minor typo (IPv4 -> IPv6). changes/ticket33804 | 7 +++ doc/tor.1.

[tor-commits] [tor/maint-0.4.3] client: Revert setting PreferIPv6 on by default

2020-04-08 Thread teor
commit cd2121a1262c2d51b8b9174933db5c985f0ccc55 Author: David Goulet Date: Tue Apr 7 09:04:01 2020 -0400 client: Revert setting PreferIPv6 on by default This change broke torsocks that by default is expecting an IPv4 for hostname resolution because it can't ask tor for a

[tor-commits] [tor/release-0.3.5] dos: Pass transport name on new client connection

2020-04-08 Thread teor
commit 894ff2dc8422cb86312c512698acd76476224f87 Author: David Goulet Date: Tue Mar 10 14:45:13 2020 -0400 dos: Pass transport name on new client connection For a bridge configured with a pluggable transport, the transport name is used, with the IP address, for the GeoIP client

[tor-commits] [tor/maint-0.4.3] Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5

2020-04-08 Thread teor
commit d380acaecad5f554f7294cfcd7fbf100f9bbaca3 Merge: 38e07b88f 894ff2dc8 Author: teor Date: Thu Apr 9 11:02:49 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-04-08 Thread teor
commit 2d6f00e45b3003337242704e0fde2d2adbaa6cf5 Merge: 34faee060 2d7e08d57 Author: teor Date: Thu Apr 9 11:03:34 2020 +1000 Merge branch 'maint-0.4.2' into maint-0.4.3 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h

[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1

2020-04-08 Thread teor
commit 1163d9a62fb40ecea50ff1279dcb55bcd7cced32 Merge: 23e401749 987f2fa50 Author: teor Date: Thu Apr 9 11:03:24 2020 +1000 Merge branch 'maint-0.4.1' into release-0.4.1 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h

[tor-commits] [tor/release-0.4.1] dos: Pass transport name on new client connection

2020-04-08 Thread teor
commit 894ff2dc8422cb86312c512698acd76476224f87 Author: David Goulet Date: Tue Mar 10 14:45:13 2020 -0400 dos: Pass transport name on new client connection For a bridge configured with a pluggable transport, the transport name is used, with the IP address, for the GeoIP client

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.4.1' into maint-0.4.2

2020-04-08 Thread teor
commit 2d7e08d57ef5d3b785cfaa6961d6d3c73fe59535 Merge: 048714d2c 987f2fa50 Author: teor Date: Thu Apr 9 11:03:27 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h

[tor-commits] [tor/release-0.4.2] dos: Pass transport name on new client connection

2020-04-08 Thread teor
commit 894ff2dc8422cb86312c512698acd76476224f87 Author: David Goulet Date: Tue Mar 10 14:45:13 2020 -0400 dos: Pass transport name on new client connection For a bridge configured with a pluggable transport, the transport name is used, with the IP address, for the GeoIP client

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5

2020-04-08 Thread teor
commit d380acaecad5f554f7294cfcd7fbf100f9bbaca3 Merge: 38e07b88f 894ff2dc8 Author: teor Date: Thu Apr 9 11:02:49 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4

[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2

2020-04-08 Thread teor
commit 2d7e08d57ef5d3b785cfaa6961d6d3c73fe59535 Merge: 048714d2c 987f2fa50 Author: teor Date: Thu Apr 9 11:03:27 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h

[tor-commits] [tor/maint-0.4.1] dos: Pass transport name on new client connection

2020-04-08 Thread teor
commit 894ff2dc8422cb86312c512698acd76476224f87 Author: David Goulet Date: Tue Mar 10 14:45:13 2020 -0400 dos: Pass transport name on new client connection For a bridge configured with a pluggable transport, the transport name is used, with the IP address, for the GeoIP client

[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.1

2020-04-08 Thread teor
commit 987f2fa50ac26af61917c7a6e13dc62f3ddb23ee Merge: 26fd31fef d380acaec Author: teor Date: Thu Apr 9 11:03:20 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.1 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h

[tor-commits] [tor/maint-0.4.3] dos: Pass transport name on new client connection

2020-04-08 Thread teor
commit 894ff2dc8422cb86312c512698acd76476224f87 Author: David Goulet Date: Tue Mar 10 14:45:13 2020 -0400 dos: Pass transport name on new client connection For a bridge configured with a pluggable transport, the transport name is used, with the IP address, for the GeoIP client

[tor-commits] [tor/maint-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1

2020-04-08 Thread teor
commit 987f2fa50ac26af61917c7a6e13dc62f3ddb23ee Merge: 26fd31fef d380acaec Author: teor Date: Thu Apr 9 11:03:20 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.1 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h

[tor-commits] [tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5

2020-04-08 Thread teor
commit d380acaecad5f554f7294cfcd7fbf100f9bbaca3 Merge: 38e07b88f 894ff2dc8 Author: teor Date: Thu Apr 9 11:02:49 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.1

2020-04-08 Thread teor
commit 987f2fa50ac26af61917c7a6e13dc62f3ddb23ee Merge: 26fd31fef d380acaec Author: teor Date: Thu Apr 9 11:03:20 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.1 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h

[tor-commits] [tor/maint-0.4.2] dos: Pass transport name on new client connection

2020-04-08 Thread teor
commit 894ff2dc8422cb86312c512698acd76476224f87 Author: David Goulet Date: Tue Mar 10 14:45:13 2020 -0400 dos: Pass transport name on new client connection For a bridge configured with a pluggable transport, the transport name is used, with the IP address, for the GeoIP client

[tor-commits] [tor/master] Merge branch 'maint-0.4.3'

2020-04-08 Thread teor
commit 59819b2916ec6d405f9f905dfa5a79791c7cfa48 Merge: 9bd73da7c 2d6f00e45 Author: teor Date: Thu Apr 9 11:03:40 2020 +1000 Merge branch 'maint-0.4.3' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org

[tor-commits] [tor/maint-0.3.5] dos: Pass transport name on new client connection

2020-04-08 Thread teor
commit 894ff2dc8422cb86312c512698acd76476224f87 Author: David Goulet Date: Tue Mar 10 14:45:13 2020 -0400 dos: Pass transport name on new client connection For a bridge configured with a pluggable transport, the transport name is used, with the IP address, for the GeoIP client

[tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5

2020-04-08 Thread teor
commit d380acaecad5f554f7294cfcd7fbf100f9bbaca3 Merge: 38e07b88f 894ff2dc8 Author: teor Date: Thu Apr 9 11:02:49 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4

[tor-commits] [tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5

2020-04-08 Thread teor
commit d380acaecad5f554f7294cfcd7fbf100f9bbaca3 Merge: 38e07b88f 894ff2dc8 Author: teor Date: Thu Apr 9 11:02:49 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4

[tor-commits] [tor/master] Merge branch 'pr1854_squashed' into maint-0.4.3

2020-04-08 Thread teor
commit f6efb3a184341b5b46c8a565e2ec297d2846e45c Merge: 2d6f00e45 cd2121a12 Author: teor Date: Thu Apr 9 11:05:59 2020 +1000 Merge branch 'pr1854_squashed' into maint-0.4.3 Squashed PR 1854, and fixed a minor typo (IPv4 -> IPv6). changes/ticket33804 | 7 +++ doc/tor.1.

[tor-commits] [tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-04-08 Thread teor
commit 2d6f00e45b3003337242704e0fde2d2adbaa6cf5 Merge: 34faee060 2d7e08d57 Author: teor Date: Thu Apr 9 11:03:34 2020 +1000 Merge branch 'maint-0.4.2' into maint-0.4.3 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5

2020-04-08 Thread teor
commit d380acaecad5f554f7294cfcd7fbf100f9bbaca3 Merge: 38e07b88f 894ff2dc8 Author: teor Date: Thu Apr 9 11:02:49 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4

[tor-commits] [tor/master] Merge branch 'maint-0.4.3'

2020-04-08 Thread teor
commit 4e3a17facdf67dc5634f2899a7839b99b515fe63 Merge: 59819b291 f6efb3a18 Author: teor Date: Thu Apr 9 11:06:51 2020 +1000 Merge branch 'maint-0.4.3' "ours" merge, to avoid taking PR 1854, which reverts "Prefer IPv6 by default&q

[tor-commits] [tor/master] client: Revert setting PreferIPv6 on by default

2020-04-08 Thread teor
commit cd2121a1262c2d51b8b9174933db5c985f0ccc55 Author: David Goulet Date: Tue Apr 7 09:04:01 2020 -0400 client: Revert setting PreferIPv6 on by default This change broke torsocks that by default is expecting an IPv4 for hostname resolution because it can't ask tor for a

[tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.1

2020-04-08 Thread teor
commit 987f2fa50ac26af61917c7a6e13dc62f3ddb23ee Merge: 26fd31fef d380acaec Author: teor Date: Thu Apr 9 11:03:20 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.1 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h

[tor-commits] [tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2

2020-04-08 Thread teor
commit 2d7e08d57ef5d3b785cfaa6961d6d3c73fe59535 Merge: 048714d2c 987f2fa50 Author: teor Date: Thu Apr 9 11:03:27 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h

[tor-commits] [tor/master] Merge branch 'pr1838_squashed'

2020-04-07 Thread teor
commit 065ccda4f67023c752162227c77b0e1319e30b85 Merge: 00ce25a72 ea9ff5892 Author: teor Date: Tue Apr 7 17:36:17 2020 +1000 Merge branch 'pr1838_squashed' changes/ticket31634| 4 ++ doc/tor.1.txt | 7 +++ scripts/maint/practracker

[tor-commits] [tor/master] Make check_subsystem_order work in out-of-tree builds.

2020-04-07 Thread teor
commit 5f49695f94abd089dfbaa2e219ac277aa5c15242 Author: Nick Mathewson Date: Sat Apr 4 11:31:30 2020 -0400 Make check_subsystem_order work in out-of-tree builds. --- scripts/maint/practracker/includes.py | 11 +++ scripts/maint/run_check_subsystem_order.sh | 2 +- 2 files

[tor-commits] [tor/master] Make check_subsystem_order work in distcheck builds.

2020-04-07 Thread teor
commit d3db84c1e7792e75f75d3fcbf66ba1bbd7617aa9 Author: Nick Mathewson Date: Sat Apr 4 11:31:30 2020 -0400 Make check_subsystem_order work in distcheck builds. --- scripts/maint/practracker/includes.py | 5 + 1 file changed, 5 insertions(+) diff --git

[tor-commits] [tor/master] Try rewriting normalize_srcdir to normalize harder.

2020-04-07 Thread teor
commit ea9ff58921da4f636a3c5faf409224cdd13c4a8a Author: Nick Mathewson Date: Mon Apr 6 10:48:59 2020 -0400 Try rewriting normalize_srcdir to normalize harder. --- scripts/maint/practracker/includes.py | 33 + 1 file changed, 25 insertions(+), 8 deletions(-)

[tor-commits] [tor/master] Add --dbg-dump-subsystem-list command to list the subsystems.

2020-04-07 Thread teor
commit ac72ecd5813e878e223df48556a43061e0d0068c Author: Nick Mathewson Date: Mon Sep 30 10:07:20 2019 -0400 Add --dbg-dump-subsystem-list command to list the subsystems. I'm prefixing this with --dbg-* because it is not meant to be used externally. --- src/app/config/config.c

[tor-commits] [tor/master] add changes file for 31634

2020-04-07 Thread teor
commit f9c57313d03abccbbbcffc808464365500baced8 Author: Nick Mathewson Date: Thu Mar 26 12:40:56 2020 -0400 add changes file for 31634 --- changes/ticket31634 | 4 1 file changed, 4 insertions(+) diff --git a/changes/ticket31634 b/changes/ticket31634 new file mode 100644 index

[tor-commits] [tor/master] Extend includes.py to compare topology with subsystem init order.

2020-04-07 Thread teor
commit a40d539f7cce851a4a66c68a14917e1681972475 Author: Nick Mathewson Date: Fri Feb 14 12:58:39 2020 -0500 Extend includes.py to compare topology with subsystem init order. --- scripts/maint/practracker/includes.py | 50 +-- 1 file changed, 48

[tor-commits] [tor/master] Implement a function to list the subsystems to stdout.

2020-04-07 Thread teor
commit 8f49943459564a59ca7f60476aef6b0ddd79a56c Author: Nick Mathewson Date: Mon Sep 30 10:05:42 2019 -0400 Implement a function to list the subsystems to stdout. --- src/app/main/subsysmgr.c | 13 + src/app/main/subsysmgr.h | 2 ++ 2 files changed, 15 insertions(+) diff

[tor-commits] [tor/master] Add a test script to check subsystem order as part of make check.

2020-04-07 Thread teor
commit 9b434b79ce74dab0498fc0ee1df5df3b2441cfad Author: Nick Mathewson Date: Thu Mar 26 12:37:49 2020 -0400 Add a test script to check subsystem order as part of make check. --- scripts/maint/run_check_subsystem_order.sh | 17 + src/test/include.am|

[tor-commits] [tor/master] Teach --check-subsystem-order to take input from stdin

2020-04-07 Thread teor
commit 978b7ef45c21169a01a81cd1b206530cbcd47fe2 Author: Nick Mathewson Date: Thu Mar 26 12:30:30 2020 -0400 Teach --check-subsystem-order to take input from stdin --- scripts/maint/practracker/includes.py | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git

[tor-commits] [tor/master] Add a "location" field for subsystems to declare which file they are in.

2020-04-07 Thread teor
commit 53d74c0954b989d478c868b12647e1088a079457 Author: Nick Mathewson Date: Fri Feb 14 09:39:36 2020 -0500 Add a "location" field for subsystems to declare which file they are in. --- src/lib/subsys/subsys.h | 13 + 1 file changed, 13 insertions(+) diff --git

[tor-commits] [tor/master] Document the --dbg- prefix in tor.1

2020-04-07 Thread teor
commit c323cc0913bae31a0b70c94bf5fd685acd3d1c07 Author: Nick Mathewson Date: Mon Sep 30 10:10:50 2019 -0400 Document the --dbg- prefix in tor.1 --- doc/tor.1.txt | 7 +++ 1 file changed, 7 insertions(+) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index ba9b9bb5e..06772a5c7 100644 ---

[tor-commits] [tor/master] Add a SUBSYS_DECLARE_LOCATION() to every subsystem.

2020-04-07 Thread teor
commit 3f6e37b1bcb9e5ec70f228a9cb6b01db0b9ad8d5 Author: Nick Mathewson Date: Fri Feb 14 09:57:46 2020 -0500 Add a SUBSYS_DECLARE_LOCATION() to every subsystem. --- src/core/mainloop/mainloop_sys.c | 1 + src/core/or/or_sys.c | 1 + src/feature/control/btrack.c | 1 +

[tor-commits] [torspec/master] Bug 33759: Fix recent_measurements_excluded_few_count key

2020-04-06 Thread teor
commit 47b495f5f0f4c936cb89055d646885e640be4c47 Author: Georg Koppen Date: Mon Mar 30 13:32:56 2020 + Bug 33759: Fix recent_measurements_excluded_few_count key --- bandwidth-file-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bandwidth-file-spec.txt

[tor-commits] [tor/master] channel: Fix a comment typo

2020-04-06 Thread teor
commit 00ce25a7206d091444a65f1157468c8cb256b586 Author: teor Date: Mon Apr 6 19:10:30 2020 +1000 channel: Fix a comment typo --- src/core/or/channel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/or/channel.c b/src/core/or/channel.c index ccc5f571d

[tor-commits] [tor/master] channel: Remove a newline at the start of the file

2020-04-06 Thread teor
commit 6df16022a1b84c770644003d8a74288a2d999c6c Author: teor Date: Mon Apr 6 19:08:33 2020 +1000 channel: Remove a newline at the start of the file --- src/core/or/channel.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/core/or/channel.c b/src/core/or/channel.c index 160ab587f

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3

2020-04-05 Thread teor
commit e8bbdc69d1cb3260974d0e44aed06e9a6983daa6 Merge: 938502062 80a306c6e Author: teor Date: Sun Apr 5 17:17:47 2020 +1000 Merge branch 'maint-0.4.3' into release-0.4.3 doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion

[tor-commits] [tor/release-0.4.3] doc: Fix another man page typo

2020-04-05 Thread teor
commit 80a306c6e7d20efc44f2f93b559c44a52d952c39 Author: teor Date: Sun Apr 5 17:17:03 2020 +1000 doc: Fix another man page typo The default value of the option is "auto", not "default". --- doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/maint-0.4.3] doc: Fix another man page typo

2020-04-05 Thread teor
commit 80a306c6e7d20efc44f2f93b559c44a52d952c39 Author: teor Date: Sun Apr 5 17:17:03 2020 +1000 doc: Fix another man page typo The default value of the option is "auto", not "default". --- doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.4.3'

2020-04-05 Thread teor
commit 7adf72f1b426d8fa6e9f7439e735ce1d38ae57fa Merge: 5c35bb38d 80a306c6e Author: teor Date: Sun Apr 5 17:17:51 2020 +1000 Merge branch 'maint-0.4.3' doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___ tor-commits mailing

  1   2   3   4   5   6   7   8   9   10   >