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

2021-05-07 Thread translation
commit 97214477c8b7f941c92ceff21c1c1fbfb7a75bd2 Author: Translation commit bot Date: Fri May 7 22:16:26 2021 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- my.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/my.po b/my.po

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

2021-05-07 Thread translation
commit 1e4ab13c967ffe349db73eb5613586f4adb93a0b Author: Translation commit bot Date: Fri May 7 22:15:43 2021 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- my.po | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/my.po b/my.po

[tor-commits] [tor/release-0.4.6] Fold in the last-minute fixes

2021-05-07 Thread nickm
commit a980597a6717a23a6a4ca9fb3d3708bc62b74c85 Author: Nick Mathewson Date: Fri May 7 13:10:19 2021 -0400 Fold in the last-minute fixes --- ChangeLog | 10 ++ changes/bug40380| 3 --- changes/ticket40382 | 6 -- 3 files changed, 10 insertions(+), 9

[tor-commits] [tor/release-0.4.5] Fold in the last-minute fixes (0.4.5)

2021-05-07 Thread nickm
commit 27e5e33d2ca35de89d1f365a460b0b58e924ef12 Author: Nick Mathewson Date: Fri May 7 13:11:00 2021 -0400 Fold in the last-minute fixes (0.4.5) --- ChangeLog | 10 ++ changes/bug40380| 3 --- changes/ticket40382 | 6 -- 3 files changed, 10 insertions(+), 9

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

2021-05-07 Thread nickm
commit dd8ed19e95974df5ebbf19bc2af389bf300525d8 Merge: 18acf43175 e4f2b52deb Author: Nick Mathewson Date: Fri May 7 13:08:25 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6 changes/ticket40382 | 6 ++ src/lib/sandbox/sandbox.c | 22 ++ 2 files

[tor-commits] [tor/release-0.4.6] Merge branch 'ticket40382_045' into maint-0.4.5

2021-05-07 Thread nickm
commit d85ef0d5e042b2f8693d6a104b8c97d58d0ed5f6 Merge: 7c86f34340 f5acfe6723 Author: Nick Mathewson Date: Fri May 7 13:08:14 2021 -0400 Merge branch 'ticket40382_045' into maint-0.4.5 changes/ticket40382 | 6 ++ src/lib/sandbox/sandbox.c | 22 ++ 2 files

[tor-commits] [tor/release-0.4.6] Add a sandbox workaround for Glibc 2.33

2021-05-07 Thread nickm
commit f5acfe67238a331bf8a6e9471516394f27e7 Author: Nick Mathewson Date: Fri May 7 12:09:41 2021 -0400 Add a sandbox workaround for Glibc 2.33 This change permits the newfstatat() system call, and fixes issues 40382 (and 40381). This isn't a free change. From the

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

2021-05-07 Thread nickm
commit d85ef0d5e042b2f8693d6a104b8c97d58d0ed5f6 Merge: 7c86f34340 f5acfe6723 Author: Nick Mathewson Date: Fri May 7 13:08:14 2021 -0400 Merge branch 'ticket40382_045' into maint-0.4.5 changes/ticket40382 | 6 ++ src/lib/sandbox/sandbox.c | 22 ++ 2 files

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

2021-05-07 Thread nickm
commit e4f2b52debc727fc35806adc889227d8aaf975a8 Merge: 5acf18bfaa d85ef0d5e0 Author: Nick Mathewson Date: Fri May 7 13:08:25 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/ticket40382 | 6 ++ src/lib/sandbox/sandbox.c | 22 ++ 2 files

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

2021-05-07 Thread nickm
commit 671b05edfc4c9d5fdc67b64a5723b74909ea8add Merge: 03f1983c63 d85ef0d5e0 Author: Nick Mathewson Date: Fri May 7 13:08:25 2021 -0400 Merge branch 'maint-0.4.5' into release-0.4.5 changes/ticket40382 | 6 ++ src/lib/sandbox/sandbox.c | 22 ++ 2 files

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

2021-05-07 Thread nickm
commit 4e62c171144c1b4a1cb1447d86a177655f90c0b6 Merge: a4c8591c35 e4f2b52deb Author: Nick Mathewson Date: Fri May 7 13:08:25 2021 -0400 Merge branch 'maint-0.4.6' changes/ticket40382 | 6 ++ src/lib/sandbox/sandbox.c | 22 ++ 2 files changed, 28

[tor-commits] [tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-05-07 Thread nickm
commit e4f2b52debc727fc35806adc889227d8aaf975a8 Merge: 5acf18bfaa d85ef0d5e0 Author: Nick Mathewson Date: Fri May 7 13:08:25 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/ticket40382 | 6 ++ src/lib/sandbox/sandbox.c | 22 ++ 2 files

[tor-commits] [tor/release-0.4.5] Add a sandbox workaround for Glibc 2.33

2021-05-07 Thread nickm
commit f5acfe67238a331bf8a6e9471516394f27e7 Author: Nick Mathewson Date: Fri May 7 12:09:41 2021 -0400 Add a sandbox workaround for Glibc 2.33 This change permits the newfstatat() system call, and fixes issues 40382 (and 40381). This isn't a free change. From the

[tor-commits] [tor/master] Add a sandbox workaround for Glibc 2.33

2021-05-07 Thread nickm
commit f5acfe67238a331bf8a6e9471516394f27e7 Author: Nick Mathewson Date: Fri May 7 12:09:41 2021 -0400 Add a sandbox workaround for Glibc 2.33 This change permits the newfstatat() system call, and fixes issues 40382 (and 40381). This isn't a free change. From the

[tor-commits] [tor/master] Merge branch 'ticket40382_045' into maint-0.4.5

2021-05-07 Thread nickm
commit d85ef0d5e042b2f8693d6a104b8c97d58d0ed5f6 Merge: 7c86f34340 f5acfe6723 Author: Nick Mathewson Date: Fri May 7 13:08:14 2021 -0400 Merge branch 'ticket40382_045' into maint-0.4.5 changes/ticket40382 | 6 ++ src/lib/sandbox/sandbox.c | 22 ++ 2 files

[tor-commits] [tor/maint-0.4.6] Merge branch 'ticket40382_045' into maint-0.4.5

2021-05-07 Thread nickm
commit d85ef0d5e042b2f8693d6a104b8c97d58d0ed5f6 Merge: 7c86f34340 f5acfe6723 Author: Nick Mathewson Date: Fri May 7 13:08:14 2021 -0400 Merge branch 'ticket40382_045' into maint-0.4.5 changes/ticket40382 | 6 ++ src/lib/sandbox/sandbox.c | 22 ++ 2 files

[tor-commits] [tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-05-07 Thread nickm
commit e4f2b52debc727fc35806adc889227d8aaf975a8 Merge: 5acf18bfaa d85ef0d5e0 Author: Nick Mathewson Date: Fri May 7 13:08:25 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/ticket40382 | 6 ++ src/lib/sandbox/sandbox.c | 22 ++ 2 files

[tor-commits] [tor/maint-0.4.5] Add a sandbox workaround for Glibc 2.33

2021-05-07 Thread nickm
commit f5acfe67238a331bf8a6e9471516394f27e7 Author: Nick Mathewson Date: Fri May 7 12:09:41 2021 -0400 Add a sandbox workaround for Glibc 2.33 This change permits the newfstatat() system call, and fixes issues 40382 (and 40381). This isn't a free change. From the

[tor-commits] [tor/maint-0.4.5] Merge branch 'ticket40382_045' into maint-0.4.5

2021-05-07 Thread nickm
commit d85ef0d5e042b2f8693d6a104b8c97d58d0ed5f6 Merge: 7c86f34340 f5acfe6723 Author: Nick Mathewson Date: Fri May 7 13:08:14 2021 -0400 Merge branch 'ticket40382_045' into maint-0.4.5 changes/ticket40382 | 6 ++ src/lib/sandbox/sandbox.c | 22 ++ 2 files

[tor-commits] [tor/maint-0.4.6] Add a sandbox workaround for Glibc 2.33

2021-05-07 Thread nickm
commit f5acfe67238a331bf8a6e9471516394f27e7 Author: Nick Mathewson Date: Fri May 7 12:09:41 2021 -0400 Add a sandbox workaround for Glibc 2.33 This change permits the newfstatat() system call, and fixes issues 40382 (and 40381). This isn't a free change. From the

[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.4.4' into maint-0.4.5

2021-05-07 Thread nickm
commit 7c86f34340acf7d8cf35501e71b03f2feba1245e Merge: 7fe819c951 48dd87933d Author: Nick Mathewson Date: Fri May 7 10:41:34 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+), 4

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

2021-05-07 Thread nickm
commit 5acf18bfaa562cb1bba72caa196c195dff8e162e Merge: 0397a9cb49 7c86f34340 Author: Nick Mathewson Date: Fri May 7 10:41:34 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+), 4

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

2021-05-07 Thread nickm
commit 48dd87933dd1c592937ef62d20aeac8998edc0fb Merge: f68aeda549 e2c1ac214c Author: Nick Mathewson Date: Fri May 7 10:41:33 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+), 4

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

2021-05-07 Thread nickm
commit 48dd87933dd1c592937ef62d20aeac8998edc0fb Merge: f68aeda549 e2c1ac214c Author: Nick Mathewson Date: Fri May 7 10:41:33 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+), 4

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

2021-05-07 Thread nickm
commit 18acf43175e7eb9164c4e2baaee7304347fae491 Merge: 8222f2f3ee 5acf18bfaa Author: Nick Mathewson Date: Fri May 7 10:41:34 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+),

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

2021-05-07 Thread nickm
commit 6dc3423e3ebd7ab10647b54b87584764349f4a50 Merge: d6816de3e0 e2c1ac214c Author: Nick Mathewson Date: Fri May 7 10:41:33 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+),

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

2021-05-07 Thread nickm
commit 48dd87933dd1c592937ef62d20aeac8998edc0fb Merge: f68aeda549 e2c1ac214c Author: Nick Mathewson Date: Fri May 7 10:41:33 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+), 4

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

2021-05-07 Thread nickm
commit 7c86f34340acf7d8cf35501e71b03f2feba1245e Merge: 7fe819c951 48dd87933d Author: Nick Mathewson Date: Fri May 7 10:41:34 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+), 4

[tor-commits] [tor/release-0.3.5] Reindent a few lines to fix a GCC warning.

2021-05-07 Thread nickm
commit e2c1ac214c0ae77282709b50fb9fbdde50dd7a1f Author: Nick Mathewson Date: Fri May 7 10:39:20 2021 -0400 Reindent a few lines to fix a GCC warning. As of GCC 11.1.1, the compiler warns us about code like this: if (a) b; c; and

[tor-commits] [tor/release-0.4.6] Reindent a few lines to fix a GCC warning.

2021-05-07 Thread nickm
commit e2c1ac214c0ae77282709b50fb9fbdde50dd7a1f Author: Nick Mathewson Date: Fri May 7 10:39:20 2021 -0400 Reindent a few lines to fix a GCC warning. As of GCC 11.1.1, the compiler warns us about code like this: if (a) b; c; and

[tor-commits] [tor/release-0.4.5] Reindent a few lines to fix a GCC warning.

2021-05-07 Thread nickm
commit e2c1ac214c0ae77282709b50fb9fbdde50dd7a1f Author: Nick Mathewson Date: Fri May 7 10:39:20 2021 -0400 Reindent a few lines to fix a GCC warning. As of GCC 11.1.1, the compiler warns us about code like this: if (a) b; c; and

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

2021-05-07 Thread nickm
commit 03f1983c63c4e8571964882c442a04e867545168 Merge: 489d18508c 7c86f34340 Author: Nick Mathewson Date: Fri May 7 10:41:34 2021 -0400 Merge branch 'maint-0.4.5' into release-0.4.5 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+),

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

2021-05-07 Thread nickm
commit 48dd87933dd1c592937ef62d20aeac8998edc0fb Merge: f68aeda549 e2c1ac214c Author: Nick Mathewson Date: Fri May 7 10:41:33 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+), 4

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

2021-05-07 Thread nickm
commit ef88ceedba47c26f65e6122eadcaa739564d3778 Merge: 49740f020d 48dd87933d Author: Nick Mathewson Date: Fri May 7 10:41:34 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+),

[tor-commits] [tor/release-0.4.4] Reindent a few lines to fix a GCC warning.

2021-05-07 Thread nickm
commit e2c1ac214c0ae77282709b50fb9fbdde50dd7a1f Author: Nick Mathewson Date: Fri May 7 10:39:20 2021 -0400 Reindent a few lines to fix a GCC warning. As of GCC 11.1.1, the compiler warns us about code like this: if (a) b; c; and

[tor-commits] [tor/maint-0.4.6] Merge branch 'maint-0.4.4' into maint-0.4.5

2021-05-07 Thread nickm
commit 7c86f34340acf7d8cf35501e71b03f2feba1245e Merge: 7fe819c951 48dd87933d Author: Nick Mathewson Date: Fri May 7 10:41:34 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+), 4

[tor-commits] [tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-05-07 Thread nickm
commit 5acf18bfaa562cb1bba72caa196c195dff8e162e Merge: 0397a9cb49 7c86f34340 Author: Nick Mathewson Date: Fri May 7 10:41:34 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+), 4

[tor-commits] [tor/maint-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5

2021-05-07 Thread nickm
commit 7c86f34340acf7d8cf35501e71b03f2feba1245e Merge: 7fe819c951 48dd87933d Author: Nick Mathewson Date: Fri May 7 10:41:34 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+), 4

[tor-commits] [tor/maint-0.4.6] Reindent a few lines to fix a GCC warning.

2021-05-07 Thread nickm
commit e2c1ac214c0ae77282709b50fb9fbdde50dd7a1f Author: Nick Mathewson Date: Fri May 7 10:39:20 2021 -0400 Reindent a few lines to fix a GCC warning. As of GCC 11.1.1, the compiler warns us about code like this: if (a) b; c; and

[tor-commits] [tor/maint-0.4.5] Reindent a few lines to fix a GCC warning.

2021-05-07 Thread nickm
commit e2c1ac214c0ae77282709b50fb9fbdde50dd7a1f Author: Nick Mathewson Date: Fri May 7 10:39:20 2021 -0400 Reindent a few lines to fix a GCC warning. As of GCC 11.1.1, the compiler warns us about code like this: if (a) b; c; and

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

2021-05-07 Thread nickm
commit 48dd87933dd1c592937ef62d20aeac8998edc0fb Merge: f68aeda549 e2c1ac214c Author: Nick Mathewson Date: Fri May 7 10:41:33 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+), 4

[tor-commits] [tor/maint-0.4.4] Reindent a few lines to fix a GCC warning.

2021-05-07 Thread nickm
commit e2c1ac214c0ae77282709b50fb9fbdde50dd7a1f Author: Nick Mathewson Date: Fri May 7 10:39:20 2021 -0400 Reindent a few lines to fix a GCC warning. As of GCC 11.1.1, the compiler warns us about code like this: if (a) b; c; and

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

2021-05-07 Thread nickm
commit 48dd87933dd1c592937ef62d20aeac8998edc0fb Merge: f68aeda549 e2c1ac214c Author: Nick Mathewson Date: Fri May 7 10:41:33 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+), 4

[tor-commits] [tor/maint-0.3.5] Reindent a few lines to fix a GCC warning.

2021-05-07 Thread nickm
commit e2c1ac214c0ae77282709b50fb9fbdde50dd7a1f Author: Nick Mathewson Date: Fri May 7 10:39:20 2021 -0400 Reindent a few lines to fix a GCC warning. As of GCC 11.1.1, the compiler warns us about code like this: if (a) b; c; and

[tor-commits] [tor/master] Reindent a few lines to fix a GCC warning.

2021-05-07 Thread nickm
commit e2c1ac214c0ae77282709b50fb9fbdde50dd7a1f Author: Nick Mathewson Date: Fri May 7 10:39:20 2021 -0400 Reindent a few lines to fix a GCC warning. As of GCC 11.1.1, the compiler warns us about code like this: if (a) b; c; and

[tor-commits] [tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-05-07 Thread nickm
commit 5acf18bfaa562cb1bba72caa196c195dff8e162e Merge: 0397a9cb49 7c86f34340 Author: Nick Mathewson Date: Fri May 7 10:41:34 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+), 4

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

2021-05-07 Thread nickm
commit 48dd87933dd1c592937ef62d20aeac8998edc0fb Merge: f68aeda549 e2c1ac214c Author: Nick Mathewson Date: Fri May 7 10:41:33 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+), 4

[tor-commits] [tor/master] Merge branch 'maint-0.4.4' into maint-0.4.5

2021-05-07 Thread nickm
commit 7c86f34340acf7d8cf35501e71b03f2feba1245e Merge: 7fe819c951 48dd87933d Author: Nick Mathewson Date: Fri May 7 10:41:34 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+), 4

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

2021-05-07 Thread nickm
commit a4c8591c351358e18897f038efbea27cfd295ce6 Merge: 1c9890bd31 5acf18bfaa Author: Nick Mathewson Date: Fri May 7 10:41:34 2021 -0400 Merge branch 'maint-0.4.6' changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+), 4 deletions(-)

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

2021-05-07 Thread nickm
commit 0397a9cb49a34d56cd85c2b6b16f8fbd72cd2e3d Merge: 8142b368e7 7fe819c951 Author: Nick Mathewson Date: Fri May 7 09:53:58 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227

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

2021-05-07 Thread nickm
commit f68aeda5496a217f389c92a28f83828e1170cbf0 Merge: 87d96f7162 621f8a304a Author: Nick Mathewson Date: Fri May 7 09:53:57 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227

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

2021-05-07 Thread nickm
commit 4b31516b14450d99bff79c68e71329e5c364443d Merge: 29ed93d92f 7fe819c951 Author: Nick Mathewson Date: Fri May 7 09:53:58 2021 -0400 Merge branch 'maint-0.4.5' into release-0.4.5 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227

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

2021-05-07 Thread nickm
commit 7fe819c9510bc0b738c55abf7339b64498265c05 Merge: ec0b4bdafd f68aeda549 Author: Nick Mathewson Date: Fri May 7 09:53:58 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227

[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.4.4' into maint-0.4.5

2021-05-07 Thread nickm
commit 7fe819c9510bc0b738c55abf7339b64498265c05 Merge: ec0b4bdafd f68aeda549 Author: Nick Mathewson Date: Fri May 7 09:53:58 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227

[tor-commits] [tor/release-0.4.5] Start a changelog for 0.4.5.8

2021-05-07 Thread nickm
commit 489d18508c8968dddc8893ccbf5a9651ffc95ea2 Author: Nick Mathewson Date: Fri May 7 10:02:59 2021 -0400 Start a changelog for 0.4.5.8 --- ChangeLog| 52 changes/autoconf-2.70| 3 --- changes/bug40285_045 | 4

[tor-commits] [tor/release-0.4.6] Changelog for 0.4.6.3-rc

2021-05-07 Thread nickm
commit c05059f736ce14c852208cd06d68fdb15ca3d956 Author: Nick Mathewson Date: Fri May 7 09:51:07 2021 -0400 Changelog for 0.4.6.3-rc --- ChangeLog | 38 ++ changes/autoconf-2.70 | 3 --- changes/ticket40290 | 3 --- changes/ticket40356

[tor-commits] [tor/release-0.4.6] Fold geoip changelog entry into 0.4.6.3-rc changelog

2021-05-07 Thread nickm
commit 8222f2f3ee6e0629fbe2fead76a6b20de7dc23f1 Author: Nick Mathewson Date: Fri May 7 09:55:17 2021 -0400 Fold geoip changelog entry into 0.4.6.3-rc changelog --- ChangeLog| 4 changes/geoip-2021-05-07 | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff

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

2021-05-07 Thread nickm
commit 49740f020da8da6866953e1b2f55a2d5faf33876 Merge: 6088a73c73 f68aeda549 Author: Nick Mathewson Date: Fri May 7 09:53:57 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227

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

2021-05-07 Thread nickm
commit f68aeda5496a217f389c92a28f83828e1170cbf0 Merge: 87d96f7162 621f8a304a Author: Nick Mathewson Date: Fri May 7 09:53:57 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227

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

2021-05-07 Thread nickm
commit e730629a2f79e08b537b488b6bbcf6f23aa1df3c Merge: c05059f736 0397a9cb49 Author: Nick Mathewson Date: Fri May 7 09:53:58 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227

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

2021-05-07 Thread nickm
commit f68aeda5496a217f389c92a28f83828e1170cbf0 Merge: 87d96f7162 621f8a304a Author: Nick Mathewson Date: Fri May 7 09:53:57 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227

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

2021-05-07 Thread nickm
commit d6816de3e09bf35c2b3150f42dc9dbc82651b6fc Merge: 5f35664b15 621f8a304a Author: Nick Mathewson Date: Fri May 7 09:53:57 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227

[tor-commits] [tor/master] Merge branch 'maint-0.4.4' into maint-0.4.5

2021-05-07 Thread nickm
commit 7fe819c9510bc0b738c55abf7339b64498265c05 Merge: ec0b4bdafd f68aeda549 Author: Nick Mathewson Date: Fri May 7 09:53:58 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227

[tor-commits] [tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-05-07 Thread nickm
commit 0397a9cb49a34d56cd85c2b6b16f8fbd72cd2e3d Merge: 8142b368e7 7fe819c951 Author: Nick Mathewson Date: Fri May 7 09:53:58 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227

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

2021-05-07 Thread nickm
commit 1c9890bd3100730b0af1650b90c6a35d8e9e0997 Merge: 89e3028590 0397a9cb49 Author: Nick Mathewson Date: Fri May 7 09:53:58 2021 -0400 Merge branch 'maint-0.4.6' changes/geoip-2021-05-07 |3 + src/config/geoip | 3227 --

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

2021-05-07 Thread nickm
commit f68aeda5496a217f389c92a28f83828e1170cbf0 Merge: 87d96f7162 621f8a304a Author: Nick Mathewson Date: Fri May 7 09:53:57 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227

[tor-commits] [tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-05-07 Thread nickm
commit 0397a9cb49a34d56cd85c2b6b16f8fbd72cd2e3d Merge: 8142b368e7 7fe819c951 Author: Nick Mathewson Date: Fri May 7 09:53:58 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227

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

2021-05-07 Thread nickm
commit f68aeda5496a217f389c92a28f83828e1170cbf0 Merge: 87d96f7162 621f8a304a Author: Nick Mathewson Date: Fri May 7 09:53:57 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227

[tor-commits] [tor/maint-0.4.6] Merge branch 'maint-0.4.4' into maint-0.4.5

2021-05-07 Thread nickm
commit 7fe819c9510bc0b738c55abf7339b64498265c05 Merge: ec0b4bdafd f68aeda549 Author: Nick Mathewson Date: Fri May 7 09:53:58 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227

[tor-commits] [tor/maint-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5

2021-05-07 Thread nickm
commit 7fe819c9510bc0b738c55abf7339b64498265c05 Merge: ec0b4bdafd f68aeda549 Author: Nick Mathewson Date: Fri May 7 09:53:58 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227

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

2021-05-07 Thread nickm
commit f68aeda5496a217f389c92a28f83828e1170cbf0 Merge: 87d96f7162 621f8a304a Author: Nick Mathewson Date: Fri May 7 09:53:57 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227

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

2021-05-07 Thread nickm
commit f68aeda5496a217f389c92a28f83828e1170cbf0 Merge: 87d96f7162 621f8a304a Author: Nick Mathewson Date: Fri May 7 09:53:57 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227

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

2021-05-07 Thread nickm
commit 3483d6aab5fc8c4c090ffce8cc88586b650ed57b Merge: a42e58a284 ec0b4bdafd Author: Nick Mathewson Date: Fri May 7 09:39:45 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 "ours" to avoid version bump. ___ tor-commits mailing

[tor-commits] [tor/release-0.4.6] Bump to 0.4.6.3-rc

2021-05-07 Thread nickm
commit 8142b368e7c35abcbb591b054072bf28ec6e1732 Author: Nick Mathewson Date: Fri May 7 09:42:18 2021 -0400 Bump to 0.4.6.3-rc --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

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

2021-05-07 Thread nickm
commit 80ea44cbecb9e50b601ba407d59cf61db8c0a909 Merge: 993238aa2d 8142b368e7 Author: Nick Mathewson Date: Fri May 7 09:44:05 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

[tor-commits] [tor/release-0.4.6] Bump to 0.4.5.8.

2021-05-07 Thread nickm
commit ec0b4bdafd16a4303d6f8e4100b169284023f67d Author: Nick Mathewson Date: Fri May 7 09:39:33 2021 -0400 Bump to 0.4.5.8. --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

[tor-commits] [tor/release-0.4.5] Bump to 0.4.5.8.

2021-05-07 Thread nickm
commit ec0b4bdafd16a4303d6f8e4100b169284023f67d Author: Nick Mathewson Date: Fri May 7 09:39:33 2021 -0400 Bump to 0.4.5.8. --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

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

2021-05-07 Thread nickm
commit 29ed93d92f55a8c71818ca63d98d4f7a6d68d45e Merge: 7aa75d0738 ec0b4bdafd Author: Nick Mathewson Date: Fri May 7 09:44:04 2021 -0400 Merge branch 'maint-0.4.5' into release-0.4.5 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2021-05-07 Thread nickm
commit 89e3028590e4fbe7cbe0948e1533bcb3c1183d6a Merge: 93af8b1ad8 8142b368e7 Author: Nick Mathewson Date: Fri May 7 09:42:39 2021 -0400 Merge branch 'maint-0.4.6' "ours" merge to avoid version bump. ___ tor-commits mailing list

[tor-commits] [tor/master] Bump to 0.4.6.3-rc

2021-05-07 Thread nickm
commit 8142b368e7c35abcbb591b054072bf28ec6e1732 Author: Nick Mathewson Date: Fri May 7 09:42:18 2021 -0400 Bump to 0.4.6.3-rc --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

[tor-commits] [tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-05-07 Thread nickm
commit 3483d6aab5fc8c4c090ffce8cc88586b650ed57b Merge: a42e58a284 ec0b4bdafd Author: Nick Mathewson Date: Fri May 7 09:39:45 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 "ours" to avoid version bump. ___ tor-commits mailing

[tor-commits] [tor/master] Bump to 0.4.5.8.

2021-05-07 Thread nickm
commit ec0b4bdafd16a4303d6f8e4100b169284023f67d Author: Nick Mathewson Date: Fri May 7 09:39:33 2021 -0400 Bump to 0.4.5.8. --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

[tor-commits] [tor/maint-0.4.6] Bump to 0.4.6.3-rc

2021-05-07 Thread nickm
commit 8142b368e7c35abcbb591b054072bf28ec6e1732 Author: Nick Mathewson Date: Fri May 7 09:42:18 2021 -0400 Bump to 0.4.6.3-rc --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

[tor-commits] [tor/maint-0.4.6] Bump to 0.4.5.8.

2021-05-07 Thread nickm
commit ec0b4bdafd16a4303d6f8e4100b169284023f67d Author: Nick Mathewson Date: Fri May 7 09:39:33 2021 -0400 Bump to 0.4.5.8. --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

[tor-commits] [tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-05-07 Thread nickm
commit 3483d6aab5fc8c4c090ffce8cc88586b650ed57b Merge: a42e58a284 ec0b4bdafd Author: Nick Mathewson Date: Fri May 7 09:39:45 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 "ours" to avoid version bump. ___ tor-commits mailing

[tor-commits] [tor/maint-0.4.5] Bump to 0.4.5.8.

2021-05-07 Thread nickm
commit ec0b4bdafd16a4303d6f8e4100b169284023f67d Author: Nick Mathewson Date: Fri May 7 09:39:33 2021 -0400 Bump to 0.4.5.8. --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

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

2021-05-07 Thread dgoulet
commit 993238aa2d6e8d038a0e0a101518cb57d42b87c4 Merge: 432695a61e a42e58a284 Author: David Goulet Date: Fri May 7 09:05:21 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6 changes/ticket40373 | 3 +++ src/core/or/connection_edge.c | 43

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

2021-05-07 Thread dgoulet
commit 432695a61ea1c09adfcdb7e35702090f38a5be85 Merge: 0f03bd298b b1b4c05fb3 Author: David Goulet Date: Fri May 7 09:04:53 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.6] Merge branch 'release-0.4.5' into release-0.4.6

2021-05-07 Thread dgoulet
commit 0f03bd298bb247c8892561cad7640ccfeeaa1973 Merge: cf6e72b702 7aa75d0738 Author: David Goulet Date: Fri May 7 09:03:59 2021 -0400 Merge branch 'release-0.4.5' into release-0.4.6 ___ tor-commits mailing list

[tor-commits] [tor/release-0.4.6] Log warning when connecting to soon-to-be-deprecated v2 onions.

2021-05-07 Thread dgoulet
commit 80c404c4b79f3bcba3fc4585d4c62a62a04f3ed9 Author: George Kadianakis Date: Wed May 5 10:50:29 2021 +0300 Log warning when connecting to soon-to-be-deprecated v2 onions. --- changes/ticket40373 | 3 +++ src/core/or/connection_edge.c | 10 ++ 2 files changed, 13

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

2021-05-07 Thread dgoulet
commit b1b4c05fb32b1f5a5306a16e9b61b7a4912c9209 Merge: cf6e72b702 80c404c4b7 Author: David Goulet Date: Fri May 7 09:03:39 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/release-0.4.6] Merge branch 'tor-gitlab/mr/375' into maint-0.4.6

2021-05-07 Thread dgoulet
commit a42e58a284f2b1d8f975175c97eb044b57ce5905 Merge: b1b4c05fb3 5e836eb80c Author: David Goulet Date: Fri May 7 09:05:16 2021 -0400 Merge branch 'tor-gitlab/mr/375' into maint-0.4.6 changes/ticket40373 | 3 +++ src/core/or/connection_edge.c | 43

[tor-commits] [tor/release-0.4.6] Prepare for #40373: Re-introduce parsing for v2 onion addresses.

2021-05-07 Thread dgoulet
commit f230beadf469e300c783791847a346c593033dd0 Author: George Kadianakis Date: Wed May 5 11:05:09 2021 +0300 Prepare for #40373: Re-introduce parsing for v2 onion addresses. Welcome back ONION_V2_HOSTNAME! :) --- src/core/or/connection_edge.c | 28 +++-

[tor-commits] [tor/release-0.4.6] Add warning when trying to connect to deprecated v2 onions.

2021-05-07 Thread dgoulet
commit 5e836eb80c31b97f87b152351b6a7a932aeffaed Author: George Kadianakis Date: Wed May 5 11:10:28 2021 +0300 Add warning when trying to connect to deprecated v2 onions. --- changes/ticket40373 | 3 +++ src/core/or/connection_edge.c | 15 ++- 2 files changed, 17

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

2021-05-07 Thread dgoulet
commit 7aa75d0738d78ae122eb601f8c96da5f6332c2b1 Merge: 13fd8f362f 80c404c4b7 Author: David Goulet Date: Fri May 7 08:49:34 2021 -0400 Merge branch 'maint-0.4.5' into release-0.4.5 changes/ticket40373 | 3 +++ src/core/or/connection_edge.c | 10 ++ 2 files changed, 13

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

2021-05-07 Thread dgoulet
commit 1aa8fd66be0c1db3339b6b1fd6653981da9fbd75 Merge: 41ad333c2f 218f9f90fb Author: Nick Mathewson Date: Tue Apr 13 09:40:02 2021 -0400 Merge branch 'maint-0.4.5' into release-0.4.5 changes/ticket40360 | 5 + src/feature/client/entrynodes.c | 3 --- 2 files changed, 5

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

2021-05-07 Thread dgoulet
commit 792151e4f42464195943169374b4a3bcb37225d1 Merge: e6ef22ca15 a4a3721690 Author: Nick Mathewson Date: Wed Apr 21 10:34:28 2021 -0400 Merge branch 'maint-0.4.5' into release-0.4.5 ___ tor-commits mailing list

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

2021-05-07 Thread dgoulet
commit c40b729c85ff45501523cbcd37f603aceeea4774 Merge: ea781dc44f c359c3056b Author: Nick Mathewson Date: Wed Mar 24 12:25:05 2021 -0400 Merge branch 'maint-0.4.5' into release-0.4.5 changes/ticket40345 | 5 + src/core/or/channel.c | 2 +- 2 files changed, 6 insertions(+), 1

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

2021-05-07 Thread dgoulet
commit 13fd8f362fe34a68466c1320329c924f6fefaa45 Merge: 792151e4f4 8c29729916 Author: George Kadianakis Date: Fri Apr 23 13:00:23 2021 +0300 Merge branch 'maint-0.4.5' into release-0.4.5 changes/ticket40356 | 3 +++ src/feature/hs/hs_cache.c | 61

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

2021-05-07 Thread dgoulet
commit ea781dc44fe9423af4197cfc1e07825d4366e491 Merge: aa49562a05 59bbf8cde9 Author: George Kadianakis Date: Wed Mar 17 13:43:47 2021 +0200 Merge branch 'maint-0.4.5' into release-0.4.5 changes/bug40285_045 | 4 src/core/or/circuitbuild.c| 18 +-

  1   2   3   >