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

2019-08-27 Thread asn
commit 35e978da61efa04af9a5ab2399dff863bc6fb20a Merge: 78e084a12 5a73f369d Author: George Kadianakis Date: Tue Aug 27 11:49:36 2019 +0300 Merge branch 'maint-0.4.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2019-08-27 Thread asn
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] [tor/master] Merge branch 'tor-github/pr/1267'

2019-08-27 Thread asn
commit 78e084a12e55cf7f26f8663dfe738c2a49468e86 Merge: 761a0ec3d 8af92b657 Author: George Kadianakis Date: Tue Aug 27 11:47:46 2019 +0300 Merge branch 'tor-github/pr/1267' changes/bug31088| 5 + src/feature/dirauth/process_descs.c | 16 +---

[tor-commits] [tor/master] In tests, make sure that "ri" is freed on all paths.

2019-08-27 Thread asn
commit 5eca338107a4d578e1cd0204e21fd7556c0aa926 Author: Nick Mathewson Date: Mon Aug 26 18:27:55 2019 -0400 In tests, make sure that "ri" is freed on all paths. In Tor's tests, the tt_*() macros can call "goto done" on failure. When that happens, we need to make sure that all

[tor-commits] [tor/master] Add test for dirserv_router_has_valid_address()

2019-08-27 Thread asn
commit c8e69e63f9d39776bd926f1a07628c03c7582280 Author: Neel Chauhan Date: Tue Aug 13 20:36:05 2019 -0400 Add test for dirserv_router_has_valid_address() --- src/test/test_address.c | 34 ++ 1 file changed, 34 insertions(+) diff --git

[tor-commits] [tor/master] test_address: parenthesize macro arguments.

2019-08-27 Thread asn
commit 8af92b6577595181eddc1dea25cf44d20bedb8a0 Author: Nick Mathewson Date: Mon Aug 26 18:30:02 2019 -0400 test_address: parenthesize macro arguments. It's good style to always add parentheses when using macro arguments, in case somebody someday provides an argument that

[tor-commits] [tor/master] Add changes file for Bug #31088

2019-08-27 Thread asn
commit cc5af6dbd5d27cc80fba9df65eea1fff5833a08d Author: Neel Chauhan Date: Fri Jul 19 13:11:45 2019 -0400 Add changes file for Bug #31088 --- changes/bug31088 | 5 + 1 file changed, 5 insertions(+) diff --git a/changes/bug31088 b/changes/bug31088 new file mode 100644 index

[tor-commits] [tor/master] Check for private IPv6 addresses in dirserv_router_has_valid_address()

2019-08-27 Thread asn
commit d9a7d4779887dbd2cba082c2a5daa535fe0d36ce Author: Neel Chauhan Date: Fri Jul 19 12:56:02 2019 -0400 Check for private IPv6 addresses in dirserv_router_has_valid_address() --- src/feature/dirauth/process_descs.c | 16 +--- src/feature/dirauth/process_descs.h | 4 2

[tor-commits] [tor/master] clarify that tor's license is free software

2019-08-27 Thread asn
commit 272265efbd89c4c2589316a20cf27064def21911 Author: Roger Dingledine Date: Fri Aug 23 21:52:33 2019 -0400 clarify that tor's license is free software no actual changes to the license. this way folks who don't immediately recognize the text of the 3-clause bsd can

[tor-commits] [tor/master] Merge remote-tracking branch 'arma/ticket31498'

2019-08-27 Thread asn
commit 761a0ec3d1d3b79f5476789621d1f9c9efd07051 Merge: 92a8573d2 272265efb Author: George Kadianakis Date: Tue Aug 27 11:46:52 2019 +0300 Merge remote-tracking branch 'arma/ticket31498' LICENSE | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1258'

2019-08-27 Thread asn
commit 92a8573d22ce05636f9f1ad96cd1df7b8d809981 Merge: 0d7f76d7c 14654d5c9 Author: George Kadianakis Date: Tue Aug 27 11:45:18 2019 +0300 Merge branch 'tor-github/pr/1258' changes/bug31490| 6 ++ src/core/or/circuituse.c| 3 +-- src/feature/hs/hs_circuit.c | 6

[tor-commits] [tor/master] Remove the unused circuit_type field from hs_ident_circuit_t and hs_ident_circuit_new()

2019-08-27 Thread asn
commit 14654d5c97663d5f2552b9f27620c8d829dd8d52 Author: Neel Chauhan Date: Fri Aug 23 14:04:05 2019 -0400 Remove the unused circuit_type field from hs_ident_circuit_t and hs_ident_circuit_new() --- changes/bug31490| 6 ++ src/core/or/circuituse.c| 3 +--

[tor-commits] [tor/master] nodelist: Add support for multiple addresses in describe.c

2019-08-27 Thread asn
commit 23844bc7399a3517af23fe7f6429333b9f66df9e Author: teor Date: Mon Aug 19 16:35:24 2019 +1000 nodelist: Add support for multiple addresses in describe.c Also prepare for unit tests. Part of 21003. --- src/feature/nodelist/describe.c | 58

[tor-commits] [tor/master] nodelist: Move router_get_verbose_nickname() declaration

2019-08-27 Thread asn
commit 81256c079f0939e1046aa1e905fe488f53c37ded Author: teor Date: Mon Aug 19 16:26:28 2019 +1000 nodelist: Move router_get_verbose_nickname() declaration The declaration was in nodelist/routerinfo.h, but the implementation was in nodelist/describe.h. Part of 21003.

[tor-commits] [tor/master] nodelist: Clear buffers and detect more caller errors in describe.c

2019-08-27 Thread asn
commit e8ba094c3e23f332dba5f2d9794c5e4c100ba568 Author: teor Date: Mon Aug 19 16:36:20 2019 +1000 nodelist: Clear buffers and detect more caller errors in describe.c Part of 21003. --- src/feature/nodelist/describe.c | 19 +++ 1 file changed, 19 insertions(+)

[tor-commits] [tor/master] changes: file for 21003

2019-08-27 Thread asn
commit 5794523f800a2693f0b4a192821f5ac6dfbeb27c Author: teor Date: Fri Aug 23 00:06:55 2019 +1000 changes: file for 21003 Log IPv6 addresses as well as IPv4 addresses, when describing routerinfos, routerstatuses, and nodes. Closes ticket 21003. ---

[tor-commits] [tor/master] test/nodelist: Add unit tests for describe.c

2019-08-27 Thread asn
commit 1ebff4d7f38272c9b66f0a4a631d7de4ac7a5c72 Author: teor Date: Thu Aug 22 23:51:53 2019 +1000 test/nodelist: Add unit tests for describe.c Part of 21003. --- src/test/test_nodelist.c | 612 +++ 1 file changed, 612 insertions(+)

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1234'

2019-08-27 Thread asn
commit 0d7f76d7ca9cf09c241e3c2b392a9d1147aa6940 Merge: 5782cee71 5794523f8 Author: George Kadianakis Date: Tue Aug 27 11:44:13 2019 +0300 Merge branch 'tor-github/pr/1234' changes/ticket21003| 3 + src/feature/control/control_events.c | 2 +-

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

2019-08-27 Thread asn
commit 8a10c0696da526ff29076cba536633d5c2483439 Author: teor Date: Mon Aug 19 16:36:58 2019 +1000 test/nodelist: Fix a typo --- src/test/test_nodelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_nodelist.c b/src/test/test_nodelist.c index

[tor-commits] [tor/master] nodelist: Remove support for is_named in describe.c

2019-08-27 Thread asn
commit 03be44e216ed9e4cdba66e120094329df71e7dce Author: teor Date: Mon Aug 19 16:30:15 2019 +1000 nodelist: Remove support for is_named in describe.c The Named flag is deprecated. Removing support from the formatting code simplifies the unit tests. Part of 21003. ---

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1237'

2019-08-27 Thread asn
commit 5782cee71d2dd02875870269f33ea5761b8097f3 Merge: d819dfbde 87a3c5b11 Author: George Kadianakis Date: Tue Aug 27 11:43:10 2019 +0300 Merge branch 'tor-github/pr/1237' changes/ticket31451 | 4 src/lib/log/log.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Fix 64-bit return issue in parse_log_domain()

2019-08-27 Thread asn
commit 87a3c5b1109a65fdf9b436f1035126044d77e552 Author: Nick Mathewson Date: Mon Aug 19 13:59:57 2019 -0400 Fix 64-bit return issue in parse_log_domain() If unsigned int is 32-bits long, then our old code would give a wrong result with any log domain whose mask was >= (1<<32).

[tor-commits] [tor/master] Fix/suppress shellcheck warnings in git-push-all.sh

2019-08-26 Thread asn
commit ca667b9a8a654703b26e666d197e1f093eff2e89 Author: Nick Mathewson Date: Mon Aug 26 09:58:38 2019 -0400 Fix/suppress shellcheck warnings in git-push-all.sh (I've chosen to suppress some instances rather than 'fix' them, since the fix would require arrays or major

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1263'

2019-08-26 Thread asn
commit 859514d47753aa951730ae8c0dfbbdb4c2e63710 Merge: eff95429f ca667b9a8 Author: George Kadianakis Date: Mon Aug 26 17:35:34 2019 +0300 Merge branch 'tor-github/pr/1263' scripts/git/git-push-all.sh | 23 +++ 1 file changed, 15 insertions(+), 8 deletions(-)

[tor-commits] [tor/master] Merge branch 'doc31089_041' into doc31089_master

2019-08-19 Thread asn
commit 320f5068a07ed3dfe204d247245a62549fe976c9 Merge: 0acfd7dce fcb4d273f Author: teor Date: Thu Aug 8 23:08:19 2019 +1000 Merge branch 'doc31089_041' into doc31089_master Delete outdated comment about serving the image, which had been modified earlier in the master branch.

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1217'

2019-08-19 Thread asn
commit 60adebc4996797de4c179f489d840af9feff60e2 Merge: 4185ef29f 320f5068a Author: George Kadianakis Date: Mon Aug 19 18:07:48 2019 +0300 Merge branch 'tor-github/pr/1217' changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 179

[tor-commits] [tor/master] Merge branch 'doc31089_040' into doc31089_041

2019-08-19 Thread asn
commit fcb4d273fb54c9aa42de9609edc007d80c940e1f Merge: 40d7f1e3a c3d6c7594 Author: teor Date: Thu Aug 8 23:07:22 2019 +1000 Merge branch 'doc31089_040' into doc31089_041 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

[tor-commits] [tor/master] Merge branch 'doc31089_035' into doc31089_040

2019-08-19 Thread asn
commit c3d6c75945cd3955a7c9960d5a726dd9579e425d Merge: 0a661cde1 25f39bdfc Author: teor Date: Thu Aug 8 23:07:17 2019 +1000 Merge branch 'doc31089_035' into doc31089_040 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

[tor-commits] [tor/master] Merge branch 'doc31089_029' into doc31089_035

2019-08-19 Thread asn
commit 25f39bdfc4dfdba02b6f5e5f54938413fc53336d Merge: e83eabc9b 1087c48d6 Author: teor Date: Thu Aug 8 23:07:12 2019 +1000 Merge branch 'doc31089_029' into doc31089_035 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

[tor-commits] [tor/master] Hardcode the image into tor-exit-notice.html

2019-08-19 Thread asn
commit 1087c48d6ef56fee25ca1d06a4aa5f311fe287ff Author: rl1987 Date: Fri Jul 12 10:16:55 2019 +0300 Hardcode the image into tor-exit-notice.html --- changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177 +++- 2 files

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1122'

2019-08-19 Thread asn
commit 4185ef29fd637b4ca4aefffb4d50146acab395c3 Merge: af7cf7d5c ef2123c7c Author: George Kadianakis Date: Mon Aug 19 18:06:05 2019 +0300 Merge branch 'tor-github/pr/1122' changes/ticket24964 | 4 +++ src/feature/dircache/dircache.c | 13

[tor-commits] [tor/master] hs-v3: Disallow single hop client to post/get a descriptor

2019-08-19 Thread asn
commit ef2123c7c7bbf0cb6ec2a5528bae082d51ea8962 Author: David Goulet Date: Wed Jun 19 12:02:41 2019 -0400 hs-v3: Disallow single hop client to post/get a descriptor Closes #24964 Signed-off-by: David Goulet --- changes/ticket24964 | 4 +++

[tor-commits] [tor/master] Fix typos in HiddenServiceExportCircuitID

2019-08-19 Thread asn
commit e87e34099c00b97740557058bab907a12e3cc7af Author: teor Date: Thu Aug 15 18:58:10 2019 +1000 Fix typos in HiddenServiceExportCircuitID Closes bug 31418. --- doc/tor.1.txt | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/tor.1.txt

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1233'

2019-08-19 Thread asn
commit af7cf7d5c103e649bdd0b58a34ee83cddcbb1b99 Merge: dfc8c0b53 e87e34099 Author: George Kadianakis Date: Mon Aug 19 18:05:22 2019 +0300 Merge branch 'tor-github/pr/1233' doc/tor.1.txt | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-)

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1214'

2019-08-19 Thread asn
commit dfc8c0b536aedc47f965efd47f180aaf6f5023e1 Merge: 19e19c1fa 484b65404 Author: George Kadianakis Date: Mon Aug 19 18:04:35 2019 +0300 Merge branch 'tor-github/pr/1214' src/test/test_token_bucket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/master] test_token_bucket: negate after casting to signed type.

2019-08-19 Thread asn
commit 484b6540480ee4fdbc7a105242c897cca6d9d8eb Author: Nick Mathewson Date: Tue Aug 6 11:42:04 2019 -0400 test_token_bucket: negate after casting to signed type. Previously we tried multiplying by -1 before casting to int32_t, which would cause us to cast the -1 to an

[tor-commits] [tor/master] Coverity: fix memory leak on error in test function.

2019-08-19 Thread asn
commit ea154a6108bae597cb37e6bc53036b6dd2ed6187 Author: Nick Mathewson Date: Fri Jun 28 12:27:51 2019 -0400 Coverity: fix memory leak on error in test function. The function make_intro_from_plaintext() in test_introduce.c would leak memory if we ever hit a failure from our

[tor-commits] [tor/master] Add a changes file for coverity test fixes of 31030.

2019-08-19 Thread asn
commit 75ea7514e1e87124bf250b36a1a1c243b6b0cea0 Author: Nick Mathewson Date: Fri Jun 28 12:36:12 2019 -0400 Add a changes file for coverity test fixes of 31030. --- changes/ticket31030 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket31030 b/changes/ticket31030 new

[tor-commits] [tor/master] Fix a few coverity unitinitialzed-value warnings in the unit tests.

2019-08-19 Thread asn
commit 68792f77e51f84d0fb6758ef9491a70570ac9a53 Author: Nick Mathewson Date: Fri Jun 28 12:21:49 2019 -0400 Fix a few coverity unitinitialzed-value warnings in the unit tests. Coverity can't see that it is not in fact going to read uninitialized memory here, so we initialize

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1154'

2019-08-19 Thread asn
commit 19e19c1fa8d138b36b115a6cf5e1993df08c3df3 Merge: e411fcabd 75ea7514e Author: George Kadianakis Date: Mon Aug 19 18:03:51 2019 +0300 Merge branch 'tor-github/pr/1154' changes/ticket31030 | 3 +++ src/test/test_btrack.c| 4

[tor-commits] [tor/master] Coverity: fix test issues with always-present 'service' var.

2019-08-19 Thread asn
commit 5fa2b322005d1860d39e420cb6d3ed25f5073389 Author: Nick Mathewson Date: Fri Jun 28 12:24:26 2019 -0400 Coverity: fix test issues with always-present 'service' var. Coverity is worried that we check "service" at the end of these test functions, since it doesn't see any way

[tor-commits] [tor/master] pre-push hook: Only run practracker when a special file is present

2019-08-19 Thread asn
commit 71e5af0221568b36d128be88c958a7de018ebcb3 Author: Nick Mathewson Date: Thu Aug 8 11:32:11 2019 -0400 pre-push hook: Only run practracker when a special file is present Closes ticket 30979. --- changes/ticket30979| 5 +

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1220'

2019-08-19 Thread asn
commit e411fcabd7f52f2ddb108dd3973be944a0e0ef2b Merge: c214402a5 71e5af022 Author: George Kadianakis Date: Mon Aug 19 18:02:44 2019 +0300 Merge branch 'tor-github/pr/1220' changes/ticket30979| 5 + scripts/git/pre-push.git-hook

[tor-commits] [tor/master] Adjust test_practracker.sh to work on windows

2019-08-06 Thread asn
commit 1440c2cb340f904cafb402474b538725abdeb04f Author: Nick Mathewson Date: Thu Aug 1 15:05:34 2019 -0400 Adjust test_practracker.sh to work on windows The required change is to ignore trailing CRs when diffing files. --- scripts/maint/practracker/test_practracker.sh | 23

[tor-commits] [tor/master] make dist: only include files from practracker dir intentionally.

2019-08-06 Thread asn
commit 394528241947800a0ac881b8890e5af387e0e9d7 Author: Nick Mathewson Date: Thu Aug 1 13:45:45 2019 -0400 make dist: only include files from practracker dir intentionally. Previously, we included temporary files and whatnot, which is not good. Fixes bug 31311; bugfix

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1195'

2019-08-06 Thread asn
commit d7afdb3b0fef4db30c9eb8cdad5890bfc241bb8d Merge: 4ee65a6f8 1440c2cb3 Author: George Kadianakis Date: Tue Aug 6 14:51:47 2019 +0300 Merge branch 'tor-github/pr/1195' Makefile.am| 19 +++--- changes/ticket31304

[tor-commits] [tor/master] Port practracker unit tests to python 3

2019-08-06 Thread asn
commit 5d98b54725efb15e904ea7abacdfe85da2a82bc5 Author: Nick Mathewson Date: Thu Aug 1 14:00:48 2019 -0400 Port practracker unit tests to python 3 --- scripts/maint/practracker/practracker_tests.py | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git

[tor-commits] [tor/master] practracker: Add unit tests to test script, and test script to makefile

2019-08-06 Thread asn
commit fa60fee8d56af01f6fefca17f945bdd00d195571 Author: Nick Mathewson Date: Thu Aug 1 14:01:43 2019 -0400 practracker: Add unit tests to test script, and test script to makefile This makes all of the practracker tests get run by make check, and hence by our CI.

[tor-commits] [tor/master] Distribute practracker unit and integration tests.

2019-08-06 Thread asn
commit 30da1b61c66794fa3b321573ef7b871081cf8eff Author: Nick Mathewson Date: Thu Aug 1 13:59:26 2019 -0400 Distribute practracker unit and integration tests. --- Makefile.am | 10 ++ 1 file changed, 10 insertions(+) diff --git a/Makefile.am b/Makefile.am index

[tor-commits] [tor/master] Merge branch 'ticket31311_041' into ticket31304

2019-08-06 Thread asn
commit 49c696fb4683c46be8e957900b6a95f95e422a4e Merge: e57209dc3 394528241 Author: Nick Mathewson Date: Thu Aug 1 13:48:58 2019 -0400 Merge branch 'ticket31311_041' into ticket31304 Makefile.am | 9 ++--- changes/ticket31311 | 3 +++ 2 files changed, 9 insertions(+), 3

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

2019-07-24 Thread asn
commit b0a06e7b186f728a25c75743f30965b2ee46dc26 Merge: 634087304 bb33a2f29 Author: George Kadianakis Date: Wed Jul 24 12:32:06 2019 +0300 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug31003 | 4 src/feature/nodelist/routerlist.c | 12 ++-- 2

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

2019-07-24 Thread asn
commit bb33a2f290561f96a2ab980f295e9bafcde39707 Merge: c541258fa a9379d675 Author: George Kadianakis Date: Wed Jul 24 12:31:56 2019 +0300 Merge branch 'tor-github/pr/1181' into maint-0.4.1 changes/bug31003 | 4 src/feature/nodelist/routerlist.c | 12 ++-- 2

[tor-commits] [tor/maint-0.4.1] Set 'routerlist' global to NULL before freeing it.

2019-07-24 Thread asn
commit a9379d6750d025d8bfe54a79c26e89eb45393f3a Author: Nick Mathewson Date: Fri Jul 19 09:49:52 2019 -0400 Set 'routerlist' global to NULL before freeing it. There is other code that uses this value, and some of it is apparently reachable from inside

[tor-commits] [tor/release-0.4.1] Set 'routerlist' global to NULL before freeing it.

2019-07-24 Thread asn
commit a9379d6750d025d8bfe54a79c26e89eb45393f3a Author: Nick Mathewson Date: Fri Jul 19 09:49:52 2019 -0400 Set 'routerlist' global to NULL before freeing it. There is other code that uses this value, and some of it is apparently reachable from inside

[tor-commits] [tor/maint-0.4.1] Merge branch 'tor-github/pr/1181' into maint-0.4.1

2019-07-24 Thread asn
commit bb33a2f290561f96a2ab980f295e9bafcde39707 Merge: c541258fa a9379d675 Author: George Kadianakis Date: Wed Jul 24 12:31:56 2019 +0300 Merge branch 'tor-github/pr/1181' into maint-0.4.1 changes/bug31003 | 4 src/feature/nodelist/routerlist.c | 12 ++-- 2

[tor-commits] [tor/master] Set 'routerlist' global to NULL before freeing it.

2019-07-24 Thread asn
commit a9379d6750d025d8bfe54a79c26e89eb45393f3a Author: Nick Mathewson Date: Fri Jul 19 09:49:52 2019 -0400 Set 'routerlist' global to NULL before freeing it. There is other code that uses this value, and some of it is apparently reachable from inside

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1181' into maint-0.4.1

2019-07-24 Thread asn
commit bb33a2f290561f96a2ab980f295e9bafcde39707 Merge: c541258fa a9379d675 Author: George Kadianakis Date: Wed Jul 24 12:31:56 2019 +0300 Merge branch 'tor-github/pr/1181' into maint-0.4.1 changes/bug31003 | 4 src/feature/nodelist/routerlist.c | 12 ++-- 2

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

2019-07-24 Thread asn
commit 2944b091fcd0d614f39e89eb22a8f943ff77dc71 Merge: 91f04d006 bb33a2f29 Author: George Kadianakis Date: Wed Jul 24 12:32:06 2019 +0300 Merge branch 'maint-0.4.1' changes/bug31003 | 4 src/feature/nodelist/routerlist.c | 12 ++-- 2 files changed, 10

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1165'

2019-07-24 Thread asn
commit 91f04d006bb850736df587e2942fedcc26d3dca9 Merge: ab1f82ea2 59e523f05 Author: George Kadianakis Date: Wed Jul 24 12:29:57 2019 +0300 Merge branch 'tor-github/pr/1165' changes/bug31040| 3 +++ scripts/git/post-merge.git-hook | 6 ++ 2 files changed, 9

[tor-commits] [tor/master] Early exit from post-merge git hook script when not merging to master

2019-07-24 Thread asn
commit 59e523f058ee0953deacf1370d546cabd192584d Author: rl1987 Date: Tue Jul 2 20:06:23 2019 +0300 Early exit from post-merge git hook script when not merging to master --- changes/bug31040| 3 +++ scripts/git/post-merge.git-hook | 6 ++ 2 files changed, 9

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1152'

2019-07-04 Thread asn
commit 5303dbe6249ed4b1e268f7a5c41ed6a638c4d0e3 Merge: 85473f9aa 0fa3dc322 Author: George Kadianakis Date: Thu Jul 4 17:14:06 2019 +0300 Merge branch 'tor-github/pr/1152' changes/ticket31026 | 5 + scripts/maint/practracker/exceptions.txt | 4 ++--

[tor-commits] [tor/master] begin_cell_parse(): Add an assertion to please coverity.

2019-07-04 Thread asn
commit 0fa3dc3228a32fd21ff71e24e3c2e456e342e3b8 Author: Nick Mathewson Date: Fri Jun 28 11:27:59 2019 -0400 begin_cell_parse(): Add an assertion to please coverity. Coverity doesn't understand that if begin_cell_parse() returns 0 and sets is_begindir to 0, its address field

[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket31008_035_01'

2019-07-02 Thread asn
commit 15e28af2d18b26b9ec4eda4bc2e84ed8465a166f Merge: c0ea6f9c6 f446db59e Author: George Kadianakis Date: Tue Jul 2 13:19:40 2019 +0300 Merge remote-tracking branch 'dgoulet/ticket31008_035_01' changes/ticket31008 | 3 +++ doc/tor.1.txt | 2 +- 2 files changed, 4 insertions(+), 1

[tor-commits] [tor/master] man: Fix -help typo to --help

2019-07-02 Thread asn
commit f446db59e1fc3f87f1312defbb12894ad006d978 Author: David Goulet Date: Thu Jun 27 14:47:11 2019 -0400 man: Fix -help typo to --help Signed-off-by: David Goulet --- changes/ticket31008 | 3 +++ doc/tor.1.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff

[tor-commits] [tor/master] Clean up some uses of low-level control replies

2019-06-26 Thread asn
commit 0dd59fdb56c9a47a018856b689eaa3c6775ed3d4 Author: Taylor Yu Date: Mon Jun 17 15:08:11 2019 -0500 Clean up some uses of low-level control replies Part of ticket 30889. --- src/feature/control/control_auth.c | 8 ++-- src/feature/control/control_cmd.c | 11 +--

[tor-commits] [tor/master] Changes file for ticket 30889

2019-06-26 Thread asn
commit 5612eccef877455769f495f088f86f6e268dfd2d Author: Taylor Yu Date: Tue Jun 25 11:38:36 2019 -0500 Changes file for ticket 30889 --- changes/ticket30889 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket30889 b/changes/ticket30889 new file mode 100644 index

[tor-commits] [tor/master] Fix some onion helpers

2019-06-26 Thread asn
commit 5faf54970de4bc3c80a268b5b139c713413562fd Author: Taylor Yu Date: Tue Jun 25 10:34:53 2019 -0500 Fix some onion helpers Fix add_onion_helper_clientauth() and add_onion_helper_keyarg() to explicitly call the appropriate control reply abstractions instead of allocating

[tor-commits] [tor/master] Make control_write_reply() mockable

2019-06-26 Thread asn
commit e5e6953be74ab5d09608dcf6af48caae4e57464c Author: Taylor Yu Date: Tue Jun 25 09:54:50 2019 -0500 Make control_write_reply() mockable Part of ticket 30889. --- src/feature/control/control_proto.c | 5 +++-- src/feature/control/control_proto.h | 4 ++-- 2 files changed, 5

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1142'

2019-06-26 Thread asn
commit 72ef4f43d5a2e09bc7544b7090a8fc0992adba02 Merge: 7edd01a29 5612eccef Author: George Kadianakis Date: Wed Jun 26 10:57:24 2019 +0300 Merge branch 'tor-github/pr/1142' changes/ticket30889 | 3 + src/feature/control/control_auth.c | 8 +--

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1109'

2019-06-26 Thread asn
commit 7edd01a29bb772e09fccb4296c47c6bfd834e0e5 Merge: a57296da3 6b136c18e Author: George Kadianakis Date: Wed Jun 26 10:56:08 2019 +0300 Merge branch 'tor-github/pr/1109' Makefile.am | 19 +++ changes/bug30455 | 5 + 2 files changed, 16 insertions(+), 8

[tor-commits] [tor/master] Merge branch 'bug30455_041' into bug30455_master

2019-06-26 Thread asn
commit 6b136c18e1db40aaca7e7c32436989abf767a5c0 Merge: 438b7eec8 e218da172 Author: teor Date: Fri Jun 14 11:49:02 2019 +1000 Merge branch 'bug30455_041' into bug30455_master Makefile.am | 19 +++ changes/bug30455 | 5 + 2 files changed, 16 insertions(+), 8

[tor-commits] [tor/master] make: Improve the documentation for test-network-all

2019-06-26 Thread asn
commit e218da17229adcec3c0a4ce774c0963bfcf1f11e Author: teor Date: Fri Jun 14 11:44:26 2019 +1000 make: Improve the documentation for test-network-all "make test-network-all" shows the warnings from each test-network.sh run on the console, so developers see new warnings early.

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1139'

2019-06-26 Thread asn
commit a57296da31ced1986ede513fcc52212f0f04879a Merge: fede64822 a87700633 Author: George Kadianakis Date: Wed Jun 26 10:55:05 2019 +0300 Merge branch 'tor-github/pr/1139' Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

[tor-commits] [tor/master] Don't try to shellcheck src/rust/registry

2019-06-26 Thread asn
commit a87700633c91f98d3cef16bc7e4809a7ab6b4c2c Author: Nick Mathewson Date: Mon Jun 24 13:45:05 2019 -0400 Don't try to shellcheck src/rust/registry Fixes bug 30963; bug not in any released Tor. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor/master] Fix shellcheck warning SC2034 in test_rebind.sh.

2019-06-26 Thread asn
commit a52e00b5b315101ccb84c0ed981b6f34c4c52def Author: rl1987 Date: Sun Jun 23 14:00:43 2019 +0300 Fix shellcheck warning SC2034 in test_rebind.sh. Bugfix on be0a4be276c945e4e90b43ce8f784b5b75bef122 (not in any Tor release). --- src/test/test_rebind.sh | 2 -- 1 file changed, 2

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1128'

2019-06-26 Thread asn
commit fede64822d50c7ecb59e0d0c1da10473ee33ccae Merge: b2ef076e1 a52e00b5b Author: George Kadianakis Date: Wed Jun 26 10:53:34 2019 +0300 Merge branch 'tor-github/pr/1128' src/test/test_rebind.sh | 2 -- 1 file changed, 2 deletions(-) ___

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

2019-06-26 Thread asn
commit 8c77a9444afbc9944b15d94e388fd126c2a9b9ed Merge: d13db36d8 00acccac6 Author: George Kadianakis Date: Wed Jun 26 10:51:50 2019 +0300 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug30894 | 4 src/app/config/confparse.c | 1 + 2 files changed, 5 insertions(+)

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

2019-06-26 Thread asn
commit b2ef076e1af6c04d6f3e94b306b99bba5e1c6031 Merge: 3644f4ab5 00acccac6 Author: George Kadianakis Date: Wed Jun 26 10:51:50 2019 +0300 Merge branch 'maint-0.4.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.1] Fix memleak when failing to parse a CSV_INTERVAL.

2019-06-26 Thread asn
commit 4ab1d1c0c44a887417b04fc75b1b11bf246f2bb5 Author: Nick Mathewson Date: Sat Jun 15 16:47:16 2019 -0400 Fix memleak when failing to parse a CSV_INTERVAL. Fixes bug 30894; bugfix on 0.3.4.1-alpha --- changes/bug30894 | 4 src/app/config/confparse.c | 1 + 2

[tor-commits] [tor/maint-0.4.1] Fix memleak when failing to parse a CSV_INTERVAL.

2019-06-26 Thread asn
commit 4ab1d1c0c44a887417b04fc75b1b11bf246f2bb5 Author: Nick Mathewson Date: Sat Jun 15 16:47:16 2019 -0400 Fix memleak when failing to parse a CSV_INTERVAL. Fixes bug 30894; bugfix on 0.3.4.1-alpha --- changes/bug30894 | 4 src/app/config/confparse.c | 1 + 2

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1114' into maint-0.4.1

2019-06-26 Thread asn
commit 00acccac644c20803d11ef7e162ae327eb834cf7 Merge: e4f66bf7f 4ab1d1c0c Author: George Kadianakis Date: Wed Jun 26 10:51:12 2019 +0300 Merge branch 'tor-github/pr/1114' into maint-0.4.1 changes/bug30894 | 4 src/app/config/confparse.c | 1 + 2 files changed, 5

[tor-commits] [tor/maint-0.4.1] Merge branch 'tor-github/pr/1114' into maint-0.4.1

2019-06-26 Thread asn
commit 00acccac644c20803d11ef7e162ae327eb834cf7 Merge: e4f66bf7f 4ab1d1c0c Author: George Kadianakis Date: Wed Jun 26 10:51:12 2019 +0300 Merge branch 'tor-github/pr/1114' into maint-0.4.1 changes/bug30894 | 4 src/app/config/confparse.c | 1 + 2 files changed, 5

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

2019-06-26 Thread asn
commit 00acccac644c20803d11ef7e162ae327eb834cf7 Merge: e4f66bf7f 4ab1d1c0c Author: George Kadianakis Date: Wed Jun 26 10:51:12 2019 +0300 Merge branch 'tor-github/pr/1114' into maint-0.4.1 changes/bug30894 | 4 src/app/config/confparse.c | 1 + 2 files changed, 5

[tor-commits] [tor/master] Make evloop into a subsystem.

2019-06-14 Thread asn
commit 990b434c4f4aa5e9c410bb083c1b98cead92bb59 Author: Nick Mathewson Date: Fri Jun 7 20:03:26 2019 -0400 Make evloop into a subsystem. Note that the event base object is _not_ created from the initialize function, since it is configuration-dependent. This will wait until

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

2019-06-14 Thread asn
commit 319ce225815897d8626e85037ee203c4de634405 Merge: 438b7eec8 990b434c4 Author: George Kadianakis Date: Fri Jun 14 13:28:32 2019 +0300 Merge branch 'bug30806' changes/ticket30806 | 3 +++ src/app/main/main.c | 4 src/app/main/shutdown.c | 2 --

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1099'

2019-06-12 Thread asn
commit 438b7eec856b0caced7112dd0c87a8dae8df0c75 Merge: 96fade0a7 396134188 Author: George Kadianakis Date: Wed Jun 12 13:02:49 2019 +0300 Merge branch 'tor-github/pr/1099' changes/bug30840 | 4 changes/bug30841 | 3 +++

[tor-commits] [tor/master] Stop hard-coding env vars in the git scripts

2019-06-12 Thread asn
commit 396134188f21b3f8bdfe35171f14c6b70446ea3e Author: teor Date: Tue Jun 11 14:34:44 2019 +1000 Stop hard-coding env vars in the git scripts Set the env vars: * TOR_MASTER_NAME to override the tor master branch name, and * TOR_WKT_NAME to override the worktree path

[tor-commits] [tor/master] scripts/git: Stop hard-coding the bash path in the git scripts

2019-06-12 Thread asn
commit 973800b847844cfaacf48658d02fe3ada77cbcf6 Author: teor Date: Tue Jun 11 14:29:10 2019 +1000 scripts/git: Stop hard-coding the bash path in the git scripts Some OSes don't have bash in /usr/bin, others have an ancient bash at this path. Fixes bug 30840; bugfix on

[tor-commits] [tor/master] Tolerate net-unreachable failures in util/socketpair_ersatz

2019-06-12 Thread asn
commit c46e99c43c4ee032127f2229070e5c21c64d19be Author: Nick Mathewson Date: Fri Jun 7 13:52:03 2019 -0400 Tolerate net-unreachable failures in util/socketpair_ersatz This can happen when we have no network stack configured. Fixes bug 30804; bugfix on 0.2.5.1-alpha. ---

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1088'

2019-06-12 Thread asn
commit 96fade0a7d258a37dab0ced996a180a2722244c7 Merge: 7b3efc386 c46e99c43 Author: George Kadianakis Date: Wed Jun 12 13:01:53 2019 +0300 Merge branch 'tor-github/pr/1088' changes/bug30804 | 4 src/test/test_util.c | 5 + 2 files changed, 9 insertions(+)

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1102'

2019-06-12 Thread asn
commit 7b3efc386f472b12b1dba8329ee49eaf3c0782af Merge: f7e8b3b68 4313f1cce Author: George Kadianakis Date: Wed Jun 12 13:00:20 2019 +0300 Merge branch 'tor-github/pr/1102' doc/HACKING/EndOfLifeTor.md | 50 + doc/HACKING/ReleasingTor.md | 10

[tor-commits] [tor/master] Minor tweaks on EOL process

2019-06-12 Thread asn
commit 3ba2e04ee7ee74d20a76536b195833caf227cc32 Author: Nick Mathewson Date: Thu May 30 09:05:35 2019 -0400 Minor tweaks on EOL process First, clarify that this is for planned deprecations, not security-related issues. Second, we actually _don't_ want to remove the

[tor-commits] [tor/master] A couple of suggestions from dgoulet on EndOfLife.md

2019-06-12 Thread asn
commit d41427b054e981152659754ef2b1ee44bb76d722 Author: Nick Mathewson Date: Thu May 30 09:07:45 2019 -0400 A couple of suggestions from dgoulet on EndOfLife.md --- doc/HACKING/EndOfLifeTor.md | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git

[tor-commits] [tor/master] doc: Add End of Life Tor instructions

2019-06-12 Thread asn
commit 6263d9e13f51d7f4f077034cb7701ba530c4fd6c Author: teor Date: Thu Nov 15 12:06:29 2018 +1000 doc: Add End of Life Tor instructions Closes 28453. --- doc/HACKING/EndOfLifeTor.md | 52 + 1 file changed, 52 insertions(+) diff --git

[tor-commits] [tor/master] Merge branch 'ticket28453_v2' into ticket28453_v2_merged

2019-06-12 Thread asn
commit 4313f1cce8b714b112cce16de8b643a6bf61ae7c Merge: 3405a311d d41427b05 Author: Nick Mathewson Date: Tue Jun 11 10:22:37 2019 -0400 Merge branch 'ticket28453_v2' into ticket28453_v2_merged doc/HACKING/EndOfLifeTor.md | 50 +

[tor-commits] [tor/master] doc: Add a new Travis CI cron job when there's a new maint branch

2019-06-12 Thread asn
commit c390f1dd7ef6f458fff9064c82f3804581de07a9 Author: teor Date: Thu Nov 15 12:05:28 2018 +1000 doc: Add a new Travis CI cron job when there's a new maint branch Part of 28453. --- doc/HACKING/ReleasingTor.md | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff

[tor-commits] [tor/master] Check whether gcc-hardening is runnable, and log an error if not

2019-06-11 Thread asn
commit 66eae4afffb35afe891ec14a3389a484ecb7b373 Author: Nick Mathewson Date: Wed May 29 16:08:33 2019 -0400 Check whether gcc-hardening is runnable, and log an error if not Closes ticket 27530. --- changes/ticket27530 | 4 configure.ac| 11 +++ 2 files

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1060'

2019-06-11 Thread asn
commit a7986755eee19b948c46f0b43ad3f6174071bd79 Merge: e5ad6fb09 66eae4aff Author: George Kadianakis Date: Tue Jun 11 14:12:22 2019 +0300 Merge branch 'tor-github/pr/1060' changes/ticket27530 | 4 configure.ac| 11 +++ 2 files changed, 15 insertions(+)

[tor-commits] [tor/master] trunnel: Rename sendme.trunnel to sendme_cell.trunnel

2019-06-11 Thread asn
commit c1359b32a43b09be96e0388c12b75a9deda17e4f Author: David Goulet Date: Wed Jun 5 09:57:52 2019 -0400 trunnel: Rename sendme.trunnel to sendme_cell.trunnel This is to avoid having two sendme.{c|h} in the repository since the subsystem is implemented in

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

2019-06-11 Thread asn
commit e5ad6fb09298eff0bf8ebf0c3729602b91c3d9df Merge: 646f7a9a9 c1359b32a Author: George Kadianakis Date: Tue Jun 11 14:11:24 2019 +0300 Merge branch 'ticket30769_041_01' changes/ticket30769 | 4 src/core/or/sendme.c|

<    4   5   6   7   8   9   10   11   12   13   >