[tor-commits] [tor/release-0.4.2] Makefile: Fix "make check-includes" for out-of-tree builds

commit 10ef7a31cfa896fb8a4eddde92c4b7d1e7477ad6 Author: teor Date: Wed Nov 6 12:29:35 2019 +1000 Makefile: Fix "make check-includes" for out-of-tree builds Previously, it would run on the build tree, which did not contain any sources. Fixes bug 31335; bugfix on

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

commit cf56693f1cfd7174f41fc6a546a6c3f83a6e58e4 Merge: 3edd4842e 10ef7a31c Author: teor Date: Wed Nov 6 17:04:48 2019 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 Makefile.am | 2 +- changes/bug31335 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/maint-0.4.2] Makefile: Fix "make check-includes" for out-of-tree builds

commit 10ef7a31cfa896fb8a4eddde92c4b7d1e7477ad6 Author: teor Date: Wed Nov 6 12:29:35 2019 +1000 Makefile: Fix "make check-includes" for out-of-tree builds Previously, it would run on the build tree, which did not contain any sources. Fixes bug 31335; bugfix on

[tor-commits] [tor/master] configure: Fix variable name typos

commit bf5b17d8bbcc55fbae67b5c45077b9dcba697048 Author: teor Date: Wed Nov 6 14:02:22 2019 +1000 configure: Fix variable name typos The "if-present" clause of AC_ARG_ENABLE() sets enable_{lzma,zstd}, so we don't need to set it. The "if-not-present" clause needs to set

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

commit 23ff60c1509b005ad1fca758a8fa0745008ba22d Merge: bf5b17d8b 10ef7a31c Author: teor Date: Wed Nov 6 17:04:52 2019 +1000 Merge branch 'maint-0.4.2' Makefile.am | 2 +- changes/bug31335 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Makefile: Fix "make check-includes" for out-of-tree builds

commit 10ef7a31cfa896fb8a4eddde92c4b7d1e7477ad6 Author: teor Date: Wed Nov 6 12:29:35 2019 +1000 Makefile: Fix "make check-includes" for out-of-tree builds Previously, it would run on the build tree, which did not contain any sources. Fixes bug 31335; bugfix on

[tor-commits] [translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed

commit a2fd2586f66f1df7de3ba69ae31fb69e7074 Author: Translation commit bot Date: Wed Nov 6 05:46:03 2019 + https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed --- da/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git

[tor-commits] [translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere

commit 6a9ae936c70450df37b167c632013af91946a52d Author: Translation commit bot Date: Wed Nov 6 05:45:56 2019 + https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- da/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

commit 3026a2b6db202e36e1ece4a4e282fc0a5360887b Author: Translation commit bot Date: Wed Nov 6 05:23:24 2019 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+tr.po | 14 ++ 1 file changed, 14 insertions(+) diff --git a/contents+tr.po

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

commit 1bde356bf645f3c3d3b0a6e70c03e2baf9f89d26 Merge: 4abfcb799 0650bf369 Author: teor Date: Wed Nov 6 11:19:30 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/bug31107 | 4 src/core/or/channeltls.c | 10 +- 2 files changed, 13 insertions(+), 1

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

commit 0650bf3695ae2e118426f3f6ecf1f8a344562119 Merge: c06d540ff f0e412099 Author: teor Date: Wed Nov 6 11:15:45 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1342' into maint-0.2.9 changes/ticket31466 | 5 + src/or/connection_edge.c | 8 +--- 2 files changed, 10

[tor-commits] [tor/release-0.4.2] 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

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

commit 4f9a0033920b21882c4b6eead3c1826ee8e9 Merge: 63aff4a43 9b73088c1 Author: teor Date: Wed Nov 6 11:19:13 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1374' into maint-0.4.1 changes/bug31897 | 3 +++ src/test/test_util.c | 5 +++-- 2 files changed, 6 insertions(+), 2

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

commit 6bfdd096792194d1077a101a34859bff996c940e Merge: 15d67842f bf4a27c0e Author: teor Date: Wed Nov 6 11:16:09 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5 changes/ticket31466 | 5 + src/core/or/connection_edge.c | 6 -- 2 files

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

commit 3edd4842e38e925677bbd8911f0bdd0f9ab41bb0 Merge: dbae58d58 76fd872db Author: teor Date: Wed Nov 6 11:19:58 2019 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit d2e4262ebc134f4c6ae9e702a14da45489575b4f Merge: 6bfdd0967 2da4d64a6 Author: teor Date: Wed Nov 6 11:17:01 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1340' into maint-0.3.5 changes/bug30916 | 4 src/feature/relay/router.c | 18 -- 2 files

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

commit 0e2834a3718a3932cfe8d3148d203a0604451073 Merge: d2e4262eb 0614f8390 Author: teor Date: Wed Nov 6 11:17:43 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1348' into maint-0.3.5 changes/bug31408 | 5 src/lib/fs/conffile.c | 10 +--- src/test/test_config.c |

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

commit 76fd872db88782c6bce1b539e27ba1d1ab88cbdb Merge: 2395800d3 de6ceb0be Author: teor Date: Wed Nov 6 11:19:54 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit de6ceb0bee8c1bf56d8929940a109bdc2a2d7521 Merge: 4f9a00339 03e77ef03 Author: teor Date: Wed Nov 6 11:19:46 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug31408| 5 changes/bug31837| 5 src/lib/fs/conffile.c | 10 +---

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

commit 0650bf3695ae2e118426f3f6ecf1f8a344562119 Merge: c06d540ff f0e412099 Author: teor Date: Wed Nov 6 11:15:45 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1342' into maint-0.2.9 changes/ticket31466 | 5 + src/or/connection_edge.c | 8 +--- 2 files changed, 10

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

commit d2e4262ebc134f4c6ae9e702a14da45489575b4f Merge: 6bfdd0967 2da4d64a6 Author: teor Date: Wed Nov 6 11:17:01 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1340' into maint-0.3.5 changes/bug30916 | 4 src/feature/relay/router.c | 18 -- 2 files

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

commit c06d540ff9b507e0fa9749948fe406fb17dbee73 Merge: 752c35ca9 3c97ab3c2 Author: teor Date: Wed Nov 6 11:14:53 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.2.9 changes/bug31107| 4 src/or/channeltls.c | 10 +- 2 files changed, 13

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

commit 1bde356bf645f3c3d3b0a6e70c03e2baf9f89d26 Merge: 4abfcb799 0650bf369 Author: teor Date: Wed Nov 6 11:19:30 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/bug31107 | 4 src/core/or/channeltls.c | 10 +- 2 files changed, 13 insertions(+), 1

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

commit 4abfcb7997e4a753643fd969317c502efc6be06e Merge: 0e2834a37 cf2b00d3f Author: teor Date: Wed Nov 6 11:18:09 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.3.5 changes/bug31837| 5 + src/test/test_rebind.py | 16 +--- 2 files

[tor-commits] [tor/release-0.4.1] test/rebind: Make control formatting and log parsing more robust

commit cf2b00d3f50f3421c3c22777113e25d5f7812e67 Author: teor Date: Tue Aug 6 01:33:14 2019 +1000 test/rebind: Make control formatting and log parsing more robust * actually sleep when tor has not logged anything * log at debug level when waiting for tor to log something *

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

commit de6ceb0bee8c1bf56d8929940a109bdc2a2d7521 Merge: 4f9a00339 03e77ef03 Author: teor Date: Wed Nov 6 11:19:46 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug31408| 5 changes/bug31837| 5 src/lib/fs/conffile.c | 10 +---

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

commit 4abfcb7997e4a753643fd969317c502efc6be06e Merge: 0e2834a37 cf2b00d3f Author: teor Date: Wed Nov 6 11:18:09 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.3.5 changes/bug31837| 5 + src/test/test_rebind.py | 16 +--- 2 files

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

commit c06d540ff9b507e0fa9749948fe406fb17dbee73 Merge: 752c35ca9 3c97ab3c2 Author: teor Date: Wed Nov 6 11:14:53 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.2.9 changes/bug31107| 4 src/or/channeltls.c | 10 +- 2 files changed, 13

[tor-commits] [tor/release-0.4.0] 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

[tor-commits] [tor/release-0.4.1] changes: use correct bugfix release, and reword changes file for 31408

commit 0614f839054a52e6e1a79a366fcc70da0691df66 Author: teor Date: Mon Sep 23 11:11:50 2019 +1000 changes: use correct bugfix release, and reword changes file for 31408 --- changes/bug31408 | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/changes/bug31408

[tor-commits] [tor/release-0.4.0] changes: use correct bugfix release, and reword changes file for 31408

commit 0614f839054a52e6e1a79a366fcc70da0691df66 Author: teor Date: Mon Sep 23 11:11:50 2019 +1000 changes: use correct bugfix release, and reword changes file for 31408 --- changes/bug31408 | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/changes/bug31408

[tor-commits] [tor/release-0.4.1] util/map_anon_nofork: Add a cast to avoid passing -48 to memset

commit 9b73088c14fe24a1554950363fb80468c695937f Author: Nick Mathewson Date: Thu Oct 3 07:21:25 2019 -0400 util/map_anon_nofork: Add a cast to avoid passing -48 to memset This fixes coverity CID 1454593, and bug 31948. Bug not in any released version of Tor. ---

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

commit 1bde356bf645f3c3d3b0a6e70c03e2baf9f89d26 Merge: 4abfcb799 0650bf369 Author: teor Date: Wed Nov 6 11:19:30 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/bug31107 | 4 src/core/or/channeltls.c | 10 +- 2 files changed, 13 insertions(+), 1

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

commit 6bfdd096792194d1077a101a34859bff996c940e Merge: 15d67842f bf4a27c0e Author: teor Date: Wed Nov 6 11:16:09 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5 changes/ticket31466 | 5 + src/core/or/connection_edge.c | 6 -- 2 files

[tor-commits] [tor/release-0.4.1] Fix bug when %including folder with comment only files. #31408

commit 15490816da0f8b651d67acef9c7f4e5bf9652ce2 Author: Daniel Pinto Date: Sun Sep 22 22:30:48 2019 +0100 Fix bug when %including folder with comment only files. #31408 When processing a %included folder, a bug caused the pointer to the last element of the options list to be

[tor-commits] [tor/release-0.4.1] test: Avoid a map_anon_nofork test failure on SunOS

commit 2420c8c9366e498dfaf3b4b6389ece9dc27ca537 Author: teor Date: Mon Sep 30 14:54:56 2019 +1000 test: Avoid a map_anon_nofork test failure on SunOS This test failure happened due to a signed/unsigned integer comparison. This bug occurred on SunOS, it may also occur

[tor-commits] [tor/release-0.4.2] util/map_anon_nofork: Add a cast to avoid passing -48 to memset

commit 9b73088c14fe24a1554950363fb80468c695937f Author: Nick Mathewson Date: Thu Oct 3 07:21:25 2019 -0400 util/map_anon_nofork: Add a cast to avoid passing -48 to memset This fixes coverity CID 1454593, and bug 31948. Bug not in any released version of Tor. ---

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

commit 4f9a0033920b21882c4b6eead3c1826ee8e9 Merge: 63aff4a43 9b73088c1 Author: teor Date: Wed Nov 6 11:19:13 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1374' into maint-0.4.1 changes/bug31897 | 3 +++ src/test/test_util.c | 5 +++-- 2 files changed, 6 insertions(+), 2

[tor-commits] [tor/release-0.4.1] 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

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.2.9

commit c06d540ff9b507e0fa9749948fe406fb17dbee73 Merge: 752c35ca9 3c97ab3c2 Author: teor Date: Wed Nov 6 11:14:53 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.2.9 changes/bug31107| 4 src/or/channeltls.c | 10 +- 2 files changed, 13

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

commit 0e2834a3718a3932cfe8d3148d203a0604451073 Merge: d2e4262eb 0614f8390 Author: teor Date: Wed Nov 6 11:17:43 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1348' into maint-0.3.5 changes/bug31408 | 5 src/lib/fs/conffile.c | 10 +--- src/test/test_config.c |

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

commit 1bde356bf645f3c3d3b0a6e70c03e2baf9f89d26 Merge: 4abfcb799 0650bf369 Author: teor Date: Wed Nov 6 11:19:30 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/bug31107 | 4 src/core/or/channeltls.c | 10 +- 2 files changed, 13 insertions(+), 1

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

commit fd31468ea14c6c8f659833ae0398e931f95fb1b3 Merge: 13155e241 de6ceb0be Author: teor Date: Wed Nov 6 11:19:50 2019 +1000 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug31408| 5 changes/bug31837| 5 changes/bug31897| 3 +++

[tor-commits] [tor/release-0.4.0] Fix bug when %including folder with comment only files. #31408

commit 15490816da0f8b651d67acef9c7f4e5bf9652ce2 Author: Daniel Pinto Date: Sun Sep 22 22:30:48 2019 +0100 Fix bug when %including folder with comment only files. #31408 When processing a %included folder, a bug caused the pointer to the last element of the options list to be

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

commit 4abfcb7997e4a753643fd969317c502efc6be06e Merge: 0e2834a37 cf2b00d3f Author: teor Date: Wed Nov 6 11:18:09 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.3.5 changes/bug31837| 5 + src/test/test_rebind.py | 16 +--- 2 files

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

commit e241523195d2bc3ac03383aab9c88e612633d461 Merge: ff601da0d 03e77ef03 Author: teor Date: Wed Nov 6 11:19:42 2019 +1000 Merge branch 'maint-0.4.0' into release-0.4.0 changes/bug30916 | 4 +++ changes/bug31107 | 4 +++ changes/bug31408 | 5

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1342' into maint-0.2.9

commit 0650bf3695ae2e118426f3f6ecf1f8a344562119 Merge: c06d540ff f0e412099 Author: teor Date: Wed Nov 6 11:15:45 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1342' into maint-0.2.9 changes/ticket31466 | 5 + src/or/connection_edge.c | 8 +--- 2 files changed, 10

[tor-commits] [tor/release-0.4.0] Treat an unexpected constant-sized VERSIONS cell as a PROTOCOL_WARN.

commit 3c97ab3c24ba4a133377c7ec6ec89cc6903ffb2e Author: Nick Mathewson Date: Tue Sep 17 09:09:36 2019 -0400 Treat an unexpected constant-sized VERSIONS cell as a PROTOCOL_WARN. We previously used tor_fragile_assert() to declare that this case could not happen: VERSIONS cells

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

commit d2e4262ebc134f4c6ae9e702a14da45489575b4f Merge: 6bfdd0967 2da4d64a6 Author: teor Date: Wed Nov 6 11:17:01 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1340' into maint-0.3.5 changes/bug30916 | 4 src/feature/relay/router.c | 18 -- 2 files

[tor-commits] [tor/release-0.4.0] Add a rate-limit to our warning about the disabled .exit notation

commit f0e4120996d3a96252200ea5302dcde3af6e0bc0 Author: Nick Mathewson Date: Wed Sep 18 15:38:33 2019 -0400 Add a rate-limit to our warning about the disabled .exit notation This warning would previously be given every time we tried to open a connection to a foo.exit address,

[tor-commits] [tor/release-0.4.0] test/rebind: Make control formatting and log parsing more robust

commit cf2b00d3f50f3421c3c22777113e25d5f7812e67 Author: teor Date: Tue Aug 6 01:33:14 2019 +1000 test/rebind: Make control formatting and log parsing more robust * actually sleep when tor has not logged anything * log at debug level when waiting for tor to log something *

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

commit 6bfdd096792194d1077a101a34859bff996c940e Merge: 15d67842f bf4a27c0e Author: teor Date: Wed Nov 6 11:16:09 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5 changes/ticket31466 | 5 + src/core/or/connection_edge.c | 6 -- 2 files

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

commit 0e2834a3718a3932cfe8d3148d203a0604451073 Merge: d2e4262eb 0614f8390 Author: teor Date: Wed Nov 6 11:17:43 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1348' into maint-0.3.5 changes/bug31408 | 5 src/lib/fs/conffile.c | 10 +--- src/test/test_config.c |

[tor-commits] [tor/release-0.3.5] Extract expressions in construct_ntor_key_map()

commit 1e9488f2fd829d48eb5ef6c2170e0f7163061136 Author: Nick Mathewson Date: Wed Sep 18 11:11:05 2019 -0400 Extract expressions in construct_ntor_key_map() No behavioral change here: this is just refactoring. --- src/feature/relay/router.c | 17 +++-- 1 file changed,

[tor-commits] [tor/release-0.4.0] Extract expressions in construct_ntor_key_map()

commit 1e9488f2fd829d48eb5ef6c2170e0f7163061136 Author: Nick Mathewson Date: Wed Sep 18 11:11:05 2019 -0400 Extract expressions in construct_ntor_key_map() No behavioral change here: this is just refactoring. --- src/feature/relay/router.c | 17 +++-- 1 file changed,

[tor-commits] [tor/release-0.3.5] Avoid a crash if our "current" and "old" ntor onion keys are equal

commit 2da4d64a64a803f4b0a6d56e517b4288bef6c4f8 Author: Nick Mathewson Date: Wed Sep 18 11:14:45 2019 -0400 Avoid a crash if our "current" and "old" ntor onion keys are equal Our dimap code asserts if you try to add the same key twice; this can't happen if everything is

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

commit 0650bf3695ae2e118426f3f6ecf1f8a344562119 Merge: c06d540ff f0e412099 Author: teor Date: Wed Nov 6 11:15:45 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1342' into maint-0.2.9 changes/ticket31466 | 5 + src/or/connection_edge.c | 8 +--- 2 files changed, 10

[tor-commits] [tor/release-0.3.5] Add a rate-limit to our warning about the disabled .exit notation

commit f0e4120996d3a96252200ea5302dcde3af6e0bc0 Author: Nick Mathewson Date: Wed Sep 18 15:38:33 2019 -0400 Add a rate-limit to our warning about the disabled .exit notation This warning would previously be given every time we tried to open a connection to a foo.exit address,

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

commit d2e4262ebc134f4c6ae9e702a14da45489575b4f Merge: 6bfdd0967 2da4d64a6 Author: teor Date: Wed Nov 6 11:17:01 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1340' into maint-0.3.5 changes/bug30916 | 4 src/feature/relay/router.c | 18 -- 2 files

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

commit c06d540ff9b507e0fa9749948fe406fb17dbee73 Merge: 752c35ca9 3c97ab3c2 Author: teor Date: Wed Nov 6 11:14:53 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.2.9 changes/bug31107| 4 src/or/channeltls.c | 10 +- 2 files changed, 13

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

commit 0e2834a3718a3932cfe8d3148d203a0604451073 Merge: d2e4262eb 0614f8390 Author: teor Date: Wed Nov 6 11:17:43 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1348' into maint-0.3.5 changes/bug31408 | 5 src/lib/fs/conffile.c | 10 +--- src/test/test_config.c |

[tor-commits] [tor/release-0.3.5] changes: use correct bugfix release, and reword changes file for 31408

commit 0614f839054a52e6e1a79a366fcc70da0691df66 Author: teor Date: Mon Sep 23 11:11:50 2019 +1000 changes: use correct bugfix release, and reword changes file for 31408 --- changes/bug31408 | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/changes/bug31408

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

commit 6bfdd096792194d1077a101a34859bff996c940e Merge: 15d67842f bf4a27c0e Author: teor Date: Wed Nov 6 11:16:09 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5 changes/ticket31466 | 5 + src/core/or/connection_edge.c | 6 -- 2 files

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

commit c06d540ff9b507e0fa9749948fe406fb17dbee73 Merge: 752c35ca9 3c97ab3c2 Author: teor Date: Wed Nov 6 11:14:53 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.2.9 changes/bug31107| 4 src/or/channeltls.c | 10 +- 2 files changed, 13

[tor-commits] [tor/release-0.4.0] Avoid a crash if our "current" and "old" ntor onion keys are equal

commit 2da4d64a64a803f4b0a6d56e517b4288bef6c4f8 Author: Nick Mathewson Date: Wed Sep 18 11:14:45 2019 -0400 Avoid a crash if our "current" and "old" ntor onion keys are equal Our dimap code asserts if you try to add the same key twice; this can't happen if everything is

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

commit 1fb110d3ab296c74b8380f8eb449fc9290583532 Merge: db5df1acf 1bde356bf Author: teor Date: Wed Nov 6 11:19:34 2019 +1000 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug30916 | 4 +++ changes/bug31107 | 4 +++ changes/bug31408 | 5

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

commit d7f76b8c47ffd2512b9b454a2af87243e0f68993 Merge: 9343b4120 0650bf369 Author: teor Date: Wed Nov 6 11:19:25 2019 +1000 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug31107 | 4 changes/ticket31466 | 5 + src/or/channeltls.c | 10 +-

[tor-commits] [tor/release-0.3.5] test/rebind: Make control formatting and log parsing more robust

commit cf2b00d3f50f3421c3c22777113e25d5f7812e67 Author: teor Date: Tue Aug 6 01:33:14 2019 +1000 test/rebind: Make control formatting and log parsing more robust * actually sleep when tor has not logged anything * log at debug level when waiting for tor to log something *

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

commit 1bde356bf645f3c3d3b0a6e70c03e2baf9f89d26 Merge: 4abfcb799 0650bf369 Author: teor Date: Wed Nov 6 11:19:30 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/bug31107 | 4 src/core/or/channeltls.c | 10 +- 2 files changed, 13 insertions(+), 1

[tor-commits] [tor/release-0.3.5] Treat an unexpected constant-sized VERSIONS cell as a PROTOCOL_WARN.

commit 3c97ab3c24ba4a133377c7ec6ec89cc6903ffb2e Author: Nick Mathewson Date: Tue Sep 17 09:09:36 2019 -0400 Treat an unexpected constant-sized VERSIONS cell as a PROTOCOL_WARN. We previously used tor_fragile_assert() to declare that this case could not happen: VERSIONS cells

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

commit 4abfcb7997e4a753643fd969317c502efc6be06e Merge: 0e2834a37 cf2b00d3f Author: teor Date: Wed Nov 6 11:18:09 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.3.5 changes/bug31837| 5 + src/test/test_rebind.py | 16 +--- 2 files

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

commit 0650bf3695ae2e118426f3f6ecf1f8a344562119 Merge: c06d540ff f0e412099 Author: teor Date: Wed Nov 6 11:15:45 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1342' into maint-0.2.9 changes/ticket31466 | 5 + src/or/connection_edge.c | 8 +--- 2 files changed, 10

[tor-commits] [tor/release-0.2.9] Add a rate-limit to our warning about the disabled .exit notation

commit f0e4120996d3a96252200ea5302dcde3af6e0bc0 Author: Nick Mathewson Date: Wed Sep 18 15:38:33 2019 -0400 Add a rate-limit to our warning about the disabled .exit notation This warning would previously be given every time we tried to open a connection to a foo.exit address,

[tor-commits] [tor/release-0.3.5] Fix bug when %including folder with comment only files. #31408

commit 15490816da0f8b651d67acef9c7f4e5bf9652ce2 Author: Daniel Pinto Date: Sun Sep 22 22:30:48 2019 +0100 Fix bug when %including folder with comment only files. #31408 When processing a %included folder, a bug caused the pointer to the last element of the options list to be

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

commit de6ceb0bee8c1bf56d8929940a109bdc2a2d7521 Merge: 4f9a00339 03e77ef03 Author: teor Date: Wed Nov 6 11:19:46 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug31408| 5 changes/bug31837| 5 src/lib/fs/conffile.c | 10 +---

[tor-commits] [tor/release-0.2.9] Treat an unexpected constant-sized VERSIONS cell as a PROTOCOL_WARN.

commit 3c97ab3c24ba4a133377c7ec6ec89cc6903ffb2e Author: Nick Mathewson Date: Tue Sep 17 09:09:36 2019 -0400 Treat an unexpected constant-sized VERSIONS cell as a PROTOCOL_WARN. We previously used tor_fragile_assert() to declare that this case could not happen: VERSIONS cells

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

commit 0e2834a3718a3932cfe8d3148d203a0604451073 Merge: d2e4262eb 0614f8390 Author: teor Date: Wed Nov 6 11:17:43 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1348' into maint-0.3.5 changes/bug31408 | 5 src/lib/fs/conffile.c | 10 +--- src/test/test_config.c |

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

commit 4abfcb7997e4a753643fd969317c502efc6be06e Merge: 0e2834a37 cf2b00d3f Author: teor Date: Wed Nov 6 11:18:09 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.3.5 changes/bug31837| 5 + src/test/test_rebind.py | 16 +--- 2 files

[tor-commits] [tor/maint-0.4.2] util/map_anon_nofork: Add a cast to avoid passing -48 to memset

commit 9b73088c14fe24a1554950363fb80468c695937f Author: Nick Mathewson Date: Thu Oct 3 07:21:25 2019 -0400 util/map_anon_nofork: Add a cast to avoid passing -48 to memset This fixes coverity CID 1454593, and bug 31948. Bug not in any released version of Tor. ---

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

commit 0650bf3695ae2e118426f3f6ecf1f8a344562119 Merge: c06d540ff f0e412099 Author: teor Date: Wed Nov 6 11:15:45 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1342' into maint-0.2.9 changes/ticket31466 | 5 + src/or/connection_edge.c | 8 +--- 2 files changed, 10

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

commit 76fd872db88782c6bce1b539e27ba1d1ab88cbdb Merge: 2395800d3 de6ceb0be Author: teor Date: Wed Nov 6 11:19:54 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 6bfdd096792194d1077a101a34859bff996c940e Merge: 15d67842f bf4a27c0e Author: teor Date: Wed Nov 6 11:16:09 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5 changes/ticket31466 | 5 + src/core/or/connection_edge.c | 6 -- 2 files

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

commit d2e4262ebc134f4c6ae9e702a14da45489575b4f Merge: 6bfdd0967 2da4d64a6 Author: teor Date: Wed Nov 6 11:17:01 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1340' into maint-0.3.5 changes/bug30916 | 4 src/feature/relay/router.c | 18 -- 2 files

[tor-commits] [tor/maint-0.4.2] 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

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

commit c06d540ff9b507e0fa9749948fe406fb17dbee73 Merge: 752c35ca9 3c97ab3c2 Author: teor Date: Wed Nov 6 11:14:53 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.2.9 changes/bug31107| 4 src/or/channeltls.c | 10 +- 2 files changed, 13

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

commit 4f9a0033920b21882c4b6eead3c1826ee8e9 Merge: 63aff4a43 9b73088c1 Author: teor Date: Wed Nov 6 11:19:13 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1374' into maint-0.4.1 changes/bug31897 | 3 +++ src/test/test_util.c | 5 +++-- 2 files changed, 6 insertions(+), 2

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

commit c06d540ff9b507e0fa9749948fe406fb17dbee73 Merge: 752c35ca9 3c97ab3c2 Author: teor Date: Wed Nov 6 11:14:53 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.2.9 changes/bug31107| 4 src/or/channeltls.c | 10 +- 2 files changed, 13

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

commit de6ceb0bee8c1bf56d8929940a109bdc2a2d7521 Merge: 4f9a00339 03e77ef03 Author: teor Date: Wed Nov 6 11:19:46 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug31408| 5 changes/bug31837| 5 src/lib/fs/conffile.c | 10 +---

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

commit 6bfdd096792194d1077a101a34859bff996c940e Merge: 15d67842f bf4a27c0e Author: teor Date: Wed Nov 6 11:16:09 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5 changes/ticket31466 | 5 + src/core/or/connection_edge.c | 6 -- 2 files

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

commit 1bde356bf645f3c3d3b0a6e70c03e2baf9f89d26 Merge: 4abfcb799 0650bf369 Author: teor Date: Wed Nov 6 11:19:30 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/bug31107 | 4 src/core/or/channeltls.c | 10 +- 2 files changed, 13 insertions(+), 1

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

commit 4abfcb7997e4a753643fd969317c502efc6be06e Merge: 0e2834a37 cf2b00d3f Author: teor Date: Wed Nov 6 11:18:09 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.3.5 changes/bug31837| 5 + src/test/test_rebind.py | 16 +--- 2 files

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

commit 4abfcb7997e4a753643fd969317c502efc6be06e Merge: 0e2834a37 cf2b00d3f Author: teor Date: Wed Nov 6 11:18:09 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.3.5 changes/bug31837| 5 + src/test/test_rebind.py | 16 +--- 2 files

[tor-commits] [tor/maint-0.4.1] test/rebind: Make control formatting and log parsing more robust

commit cf2b00d3f50f3421c3c22777113e25d5f7812e67 Author: teor Date: Tue Aug 6 01:33:14 2019 +1000 test/rebind: Make control formatting and log parsing more robust * actually sleep when tor has not logged anything * log at debug level when waiting for tor to log something *

[tor-commits] [tor/maint-0.4.1] 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

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

commit 4f9a0033920b21882c4b6eead3c1826ee8e9 Merge: 63aff4a43 9b73088c1 Author: teor Date: Wed Nov 6 11:19:13 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1374' into maint-0.4.1 changes/bug31897 | 3 +++ src/test/test_util.c | 5 +++-- 2 files changed, 6 insertions(+), 2

[tor-commits] [tor/maint-0.4.0] 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

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

commit d2e4262ebc134f4c6ae9e702a14da45489575b4f Merge: 6bfdd0967 2da4d64a6 Author: teor Date: Wed Nov 6 11:17:01 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1340' into maint-0.3.5 changes/bug30916 | 4 src/feature/relay/router.c | 18 -- 2 files

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

commit 0e2834a3718a3932cfe8d3148d203a0604451073 Merge: d2e4262eb 0614f8390 Author: teor Date: Wed Nov 6 11:17:43 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1348' into maint-0.3.5 changes/bug31408 | 5 src/lib/fs/conffile.c | 10 +--- src/test/test_config.c |

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

commit 6bfdd096792194d1077a101a34859bff996c940e Merge: 15d67842f bf4a27c0e Author: teor Date: Wed Nov 6 11:16:09 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5 changes/ticket31466 | 5 + src/core/or/connection_edge.c | 6 -- 2 files

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

commit 0e2834a3718a3932cfe8d3148d203a0604451073 Merge: d2e4262eb 0614f8390 Author: teor Date: Wed Nov 6 11:17:43 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1348' into maint-0.3.5 changes/bug31408 | 5 src/lib/fs/conffile.c | 10 +--- src/test/test_config.c |

  1   2   3   >