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

2019-09-17 Thread translation
commit b145d1a2bb8e0b5e67c4b0087ca3d4f7745fb0a7 Author: Translation commit bot Date: Wed Sep 18 05:52:55 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+ja.po

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

2019-09-17 Thread translation
commit 9c9bd7939cf06b493b5e68d049ed5e7c52493f16 Author: Translation commit bot Date: Wed Sep 18 05:23:03 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ja.po | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contents+ja.po

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

2019-09-17 Thread translation
commit 3e029890e0067b7e519cc561cbe2eddce242c2ef Author: Translation commit bot Date: Wed Sep 18 04:53:06 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ja.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contents+ja.po

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

2019-09-17 Thread nickm
commit 84fc0c579b0ffa87b618cf533532d0c13e064c32 Merge: 077c71650 5f00c03ed Author: Nick Mathewson Date: Tue Sep 17 21:28:38 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug31657| 5 + src/feature/client/entrynodes.c | 3 ++-

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

2019-09-17 Thread nickm
commit 68a002c6031f52c97f1d8acbe0c42e53da452351 Merge: 2b97b1464 9e674d0eb Author: Nick Mathewson Date: Tue Sep 17 21:28:37 2019 -0400 Merge branch 'maint-0.4.0' into release-0.4.0 changes/bug31657| 5 + src/feature/client/entrynodes.c | 3 ++-

[tor-commits] [tor/release-0.4.1] entrynodes: Make routine descriptor expiry notice logs less alarming

2019-09-17 Thread nickm
commit 670d4026219534558c809c48ba36b905d18ce35f Author: teor Date: Fri Sep 6 16:23:58 2019 +1000 entrynodes: Make routine descriptor expiry notice logs less alarming When tor is missing descriptors for some primary entry guards, make the log message less alarming. It's normal

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

2019-09-17 Thread nickm
commit 9e674d0eb4d83caab5298e83c837ebd58b0f5d3d Merge: a1f97bb25 02840169d Author: Nick Mathewson Date: Tue Sep 17 21:28:37 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug31657| 5 + src/feature/client/entrynodes.c | 3 ++-

[tor-commits] [tor/release-0.4.0] entrynodes: Make routine descriptor expiry notice logs less alarming

2019-09-17 Thread nickm
commit 670d4026219534558c809c48ba36b905d18ce35f Author: teor Date: Fri Sep 6 16:23:58 2019 +1000 entrynodes: Make routine descriptor expiry notice logs less alarming When tor is missing descriptors for some primary entry guards, make the log message less alarming. It's normal

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

2019-09-17 Thread nickm
commit 9e674d0eb4d83caab5298e83c837ebd58b0f5d3d Merge: a1f97bb25 02840169d Author: Nick Mathewson Date: Tue Sep 17 21:28:37 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug31657| 5 + src/feature/client/entrynodes.c | 3 ++-

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

2019-09-17 Thread nickm
commit 02840169d860384257042bdf6d7601c2bf48b47b Merge: 50b45c43e 670d40262 Author: Nick Mathewson Date: Tue Sep 17 21:28:29 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5 changes/bug31657| 5 + src/feature/client/entrynodes.c | 3 ++-

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

2019-09-17 Thread nickm
commit 9e674d0eb4d83caab5298e83c837ebd58b0f5d3d Merge: a1f97bb25 02840169d Author: Nick Mathewson Date: Tue Sep 17 21:28:37 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug31657| 5 + src/feature/client/entrynodes.c | 3 ++-

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

2019-09-17 Thread nickm
commit 5f00c03ed0327917409b074b99b7509c26128617 Merge: c3e94a8cc 9e674d0eb Author: Nick Mathewson Date: Tue Sep 17 21:28:38 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug31657| 5 + src/feature/client/entrynodes.c | 3 ++-

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

2019-09-17 Thread nickm
commit 02840169d860384257042bdf6d7601c2bf48b47b Merge: 50b45c43e 670d40262 Author: Nick Mathewson Date: Tue Sep 17 21:28:29 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5 changes/bug31657| 5 + src/feature/client/entrynodes.c | 3 ++-

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

2019-09-17 Thread nickm
commit 5f00c03ed0327917409b074b99b7509c26128617 Merge: c3e94a8cc 9e674d0eb Author: Nick Mathewson Date: Tue Sep 17 21:28:38 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug31657| 5 + src/feature/client/entrynodes.c | 3 ++-

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

2019-09-17 Thread nickm
commit 77733021e654e5a17d59938a1e33c986c317ea7c Merge: 465a63c5f 02840169d Author: Nick Mathewson Date: Tue Sep 17 21:28:37 2019 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug31657| 5 + src/feature/client/entrynodes.c | 3 ++-

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

2019-09-17 Thread nickm
commit 7225cfc58671aaaeb2e17e7e46bc1f33b87ab22a Merge: 2013e63ac 5f00c03ed Author: Nick Mathewson Date: Tue Sep 17 21:28:38 2019 -0400 Merge branch 'maint-0.4.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2019-09-17 Thread nickm
commit 02840169d860384257042bdf6d7601c2bf48b47b Merge: 50b45c43e 670d40262 Author: Nick Mathewson Date: Tue Sep 17 21:28:29 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5 changes/bug31657| 5 + src/feature/client/entrynodes.c | 3 ++-

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

2019-09-17 Thread nickm
commit 02840169d860384257042bdf6d7601c2bf48b47b Merge: 50b45c43e 670d40262 Author: Nick Mathewson Date: Tue Sep 17 21:28:29 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5 changes/bug31657| 5 + src/feature/client/entrynodes.c | 3 ++-

[tor-commits] [tor/release-0.3.5] entrynodes: Make routine descriptor expiry notice logs less alarming

2019-09-17 Thread nickm
commit 670d4026219534558c809c48ba36b905d18ce35f Author: teor Date: Fri Sep 6 16:23:58 2019 +1000 entrynodes: Make routine descriptor expiry notice logs less alarming When tor is missing descriptors for some primary entry guards, make the log message less alarming. It's normal

[tor-commits] [tor/maint-0.3.5] entrynodes: Make routine descriptor expiry notice logs less alarming

2019-09-17 Thread nickm
commit 670d4026219534558c809c48ba36b905d18ce35f Author: teor Date: Fri Sep 6 16:23:58 2019 +1000 entrynodes: Make routine descriptor expiry notice logs less alarming When tor is missing descriptors for some primary entry guards, make the log message less alarming. It's normal

[tor-commits] [tor/maint-0.4.1] entrynodes: Make routine descriptor expiry notice logs less alarming

2019-09-17 Thread nickm
commit 670d4026219534558c809c48ba36b905d18ce35f Author: teor Date: Fri Sep 6 16:23:58 2019 +1000 entrynodes: Make routine descriptor expiry notice logs less alarming When tor is missing descriptors for some primary entry guards, make the log message less alarming. It's normal

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

2019-09-17 Thread nickm
commit 9e674d0eb4d83caab5298e83c837ebd58b0f5d3d Merge: a1f97bb25 02840169d Author: Nick Mathewson Date: Tue Sep 17 21:28:37 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug31657| 5 + src/feature/client/entrynodes.c | 3 ++-

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

2019-09-17 Thread nickm
commit 02840169d860384257042bdf6d7601c2bf48b47b Merge: 50b45c43e 670d40262 Author: Nick Mathewson Date: Tue Sep 17 21:28:29 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5 changes/bug31657| 5 + src/feature/client/entrynodes.c | 3 ++-

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

2019-09-17 Thread nickm
commit 5f00c03ed0327917409b074b99b7509c26128617 Merge: c3e94a8cc 9e674d0eb Author: Nick Mathewson Date: Tue Sep 17 21:28:38 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug31657| 5 + src/feature/client/entrynodes.c | 3 ++-

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

2019-09-17 Thread nickm
commit 02840169d860384257042bdf6d7601c2bf48b47b Merge: 50b45c43e 670d40262 Author: Nick Mathewson Date: Tue Sep 17 21:28:29 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5 changes/bug31657| 5 + src/feature/client/entrynodes.c | 3 ++-

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

2019-09-17 Thread nickm
commit 9e674d0eb4d83caab5298e83c837ebd58b0f5d3d Merge: a1f97bb25 02840169d Author: Nick Mathewson Date: Tue Sep 17 21:28:37 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug31657| 5 + src/feature/client/entrynodes.c | 3 ++-

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

2019-09-17 Thread nickm
commit 02840169d860384257042bdf6d7601c2bf48b47b Merge: 50b45c43e 670d40262 Author: Nick Mathewson Date: Tue Sep 17 21:28:29 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5 changes/bug31657| 5 + src/feature/client/entrynodes.c | 3 ++-

[tor-commits] [tor/maint-0.4.0] entrynodes: Make routine descriptor expiry notice logs less alarming

2019-09-17 Thread nickm
commit 670d4026219534558c809c48ba36b905d18ce35f Author: teor Date: Fri Sep 6 16:23:58 2019 +1000 entrynodes: Make routine descriptor expiry notice logs less alarming When tor is missing descriptors for some primary entry guards, make the log message less alarming. It's normal

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

2019-09-17 Thread nickm
commit a1f97bb25301811aa8dab7b250fb38918cee9332 Merge: ef3543558 50b45c43e Author: Nick Mathewson Date: Tue Sep 17 21:26:31 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

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

2019-09-17 Thread nickm
commit a1f97bb25301811aa8dab7b250fb38918cee9332 Merge: ef3543558 50b45c43e Author: Nick Mathewson Date: Tue Sep 17 21:26:31 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

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

2019-09-17 Thread nickm
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/release-0.3.5] Hardcode the image into tor-exit-notice.html

2019-09-17 Thread nickm
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/release-0.2.9] Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9

2019-09-17 Thread nickm
commit 967460389a2f5dd70f75dd753a0d9ff97292e5b2 Merge: 484710f25 1087c48d6 Author: Nick Mathewson Date: Tue Sep 17 21:26:17 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9 changes/doc31089| 4 +

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

2019-09-17 Thread nickm
commit 077c71650499f42cc720788e5cca0bf6cf55a18b Merge: b8628ac2a c3e94a8cc Author: Nick Mathewson Date: Tue Sep 17 21:26:32 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

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

2019-09-17 Thread nickm
commit 967460389a2f5dd70f75dd753a0d9ff97292e5b2 Merge: 484710f25 1087c48d6 Author: Nick Mathewson Date: Tue Sep 17 21:26:17 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9 changes/doc31089| 4 +

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

2019-09-17 Thread nickm
commit 50b45c43eb990b0b9b76a550b03eb9db229ad4f8 Merge: dc41e6a80 967460389 Author: Nick Mathewson Date: Tue Sep 17 21:26:31 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

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

2019-09-17 Thread nickm
commit c3e94a8ccdea60d460d0095821c1743c0f815367 Merge: a3342b382 a1f97bb25 Author: Nick Mathewson Date: Tue Sep 17 21:26:32 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

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

2019-09-17 Thread nickm
commit 2013e63accbe9e3b6f3b4e5397a9e8032e1c9fe9 Merge: 93def2bb4 c3e94a8cc Author: Nick Mathewson Date: Tue Sep 17 21:26:32 2019 -0400 Merge branch 'maint-0.4.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2019-09-17 Thread nickm
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/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9

2019-09-17 Thread nickm
commit 967460389a2f5dd70f75dd753a0d9ff97292e5b2 Merge: 484710f25 1087c48d6 Author: Nick Mathewson Date: Tue Sep 17 21:26:17 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9 changes/doc31089| 4 +

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

2019-09-17 Thread nickm
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/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2019-09-17 Thread nickm
commit 22605529b4a32a70d79b4de2e4b44a2e9b2fac1d Merge: 324e01372 967460389 Author: Nick Mathewson Date: Tue Sep 17 21:26:31 2019 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

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

2019-09-17 Thread nickm
commit 967460389a2f5dd70f75dd753a0d9ff97292e5b2 Merge: 484710f25 1087c48d6 Author: Nick Mathewson Date: Tue Sep 17 21:26:17 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9 changes/doc31089| 4 +

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

2019-09-17 Thread nickm
commit 50b45c43eb990b0b9b76a550b03eb9db229ad4f8 Merge: dc41e6a80 967460389 Author: Nick Mathewson Date: Tue Sep 17 21:26:31 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

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

2019-09-17 Thread nickm
commit 50b45c43eb990b0b9b76a550b03eb9db229ad4f8 Merge: dc41e6a80 967460389 Author: Nick Mathewson Date: Tue Sep 17 21:26:31 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

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

2019-09-17 Thread nickm
commit 465a63c5f8824d8a98ed313e61524b5f2895e210 Merge: 860837af8 50b45c43e Author: Nick Mathewson Date: Tue Sep 17 21:26:31 2019 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

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

2019-09-17 Thread nickm
commit 50b45c43eb990b0b9b76a550b03eb9db229ad4f8 Merge: dc41e6a80 967460389 Author: Nick Mathewson Date: Tue Sep 17 21:26:31 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

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

2019-09-17 Thread nickm
commit 967460389a2f5dd70f75dd753a0d9ff97292e5b2 Merge: 484710f25 1087c48d6 Author: Nick Mathewson Date: Tue Sep 17 21:26:17 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9 changes/doc31089| 4 +

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

2019-09-17 Thread nickm
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 'maint-0.4.0' into maint-0.4.1

2019-09-17 Thread nickm
commit c3e94a8ccdea60d460d0095821c1743c0f815367 Merge: a3342b382 a1f97bb25 Author: Nick Mathewson Date: Tue Sep 17 21:26:32 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

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

2019-09-17 Thread nickm
commit c3e94a8ccdea60d460d0095821c1743c0f815367 Merge: a3342b382 a1f97bb25 Author: Nick Mathewson Date: Tue Sep 17 21:26:32 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

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

2019-09-17 Thread nickm
commit 2b97b1464bba12d54e1446e70331cea2b904afb7 Merge: 1f19b5528 a1f97bb25 Author: Nick Mathewson Date: Tue Sep 17 21:26:32 2019 -0400 Merge branch 'maint-0.4.0' into release-0.4.0 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

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

2019-09-17 Thread nickm
commit a1f97bb25301811aa8dab7b250fb38918cee9332 Merge: ef3543558 50b45c43e Author: Nick Mathewson Date: Tue Sep 17 21:26:31 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

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

2019-09-17 Thread nickm
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/maint-0.2.9] Hardcode the image into tor-exit-notice.html

2019-09-17 Thread nickm
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/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9

2019-09-17 Thread nickm
commit 967460389a2f5dd70f75dd753a0d9ff97292e5b2 Merge: 484710f25 1087c48d6 Author: Nick Mathewson Date: Tue Sep 17 21:26:17 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9 changes/doc31089| 4 +

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

2019-09-17 Thread nickm
commit 967460389a2f5dd70f75dd753a0d9ff97292e5b2 Merge: 484710f25 1087c48d6 Author: Nick Mathewson Date: Tue Sep 17 21:26:17 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9 changes/doc31089| 4 +

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

2019-09-17 Thread nickm
commit 967460389a2f5dd70f75dd753a0d9ff97292e5b2 Merge: 484710f25 1087c48d6 Author: Nick Mathewson Date: Tue Sep 17 21:26:17 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9 changes/doc31089| 4 +

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

2019-09-17 Thread nickm
commit a1f97bb25301811aa8dab7b250fb38918cee9332 Merge: ef3543558 50b45c43e Author: Nick Mathewson Date: Tue Sep 17 21:26:31 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

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

2019-09-17 Thread nickm
commit 50b45c43eb990b0b9b76a550b03eb9db229ad4f8 Merge: dc41e6a80 967460389 Author: Nick Mathewson Date: Tue Sep 17 21:26:31 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

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

2019-09-17 Thread nickm
commit 50b45c43eb990b0b9b76a550b03eb9db229ad4f8 Merge: dc41e6a80 967460389 Author: Nick Mathewson Date: Tue Sep 17 21:26:31 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

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

2019-09-17 Thread nickm
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/maint-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.5

2019-09-17 Thread nickm
commit 50b45c43eb990b0b9b76a550b03eb9db229ad4f8 Merge: dc41e6a80 967460389 Author: Nick Mathewson Date: Tue Sep 17 21:26:31 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

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

2019-09-17 Thread nickm
commit 967460389a2f5dd70f75dd753a0d9ff97292e5b2 Merge: 484710f25 1087c48d6 Author: Nick Mathewson Date: Tue Sep 17 21:26:17 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9 changes/doc31089| 4 +

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

2019-09-17 Thread nickm
commit a1f97bb25301811aa8dab7b250fb38918cee9332 Merge: ef3543558 50b45c43e Author: Nick Mathewson Date: Tue Sep 17 21:26:31 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/doc31089| 4 + contrib/operator-tools/tor-exit-notice.html | 177

[tor-commits] [tor/master] Bump version to 0.4.1.6

2019-09-17 Thread nickm
commit a3342b382a1a87bbe41aa057761cd83daeadbfc7 Author: Nick Mathewson Date: Tue Sep 17 19:11:56 2019 -0400 Bump version to 0.4.1.6 --- 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.1'

2019-09-17 Thread nickm
commit 93def2bb4f2b7facd1a5a4d158143f09434e4667 Merge: 48afec91c a3342b382 Author: Nick Mathewson Date: Tue Sep 17 19:12:08 2019 -0400 Merge branch 'maint-0.4.1' "ours" to avoid version bump. ___ tor-commits mailing list

[tor-commits] [tor/release-0.4.1] Start a changelog for 0.4.1.6

2019-09-17 Thread nickm
commit cda7f4d8bda7439cde68f8504f7d98002f907c07 Author: Nick Mathewson Date: Tue Sep 17 19:11:27 2019 -0400 Start a changelog for 0.4.1.6 --- ChangeLog | 63 +++ changes/bug12399 | 3 --- changes/bug23507 | 5

[tor-commits] [tor/maint-0.4.1] Bump version to 0.4.1.6

2019-09-17 Thread nickm
commit a3342b382a1a87bbe41aa057761cd83daeadbfc7 Author: Nick Mathewson Date: Tue Sep 17 19:11:56 2019 -0400 Bump version to 0.4.1.6 --- 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.1] Merge branch 'maint-0.4.1' into release-0.4.1

2019-09-17 Thread nickm
commit b8628ac2a7f1676e7321fe742efbdf75d903700a Merge: cda7f4d8b a3342b382 Author: Nick Mathewson Date: Tue Sep 17 19:12:19 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

[tor-commits] [tor/release-0.4.1] Bump version to 0.4.1.6

2019-09-17 Thread nickm
commit a3342b382a1a87bbe41aa057761cd83daeadbfc7 Author: Nick Mathewson Date: Tue Sep 17 19:11:56 2019 -0400 Bump version to 0.4.1.6 --- 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.1] madvise: tolerate EINVAL and ENOSYS

2019-09-17 Thread nickm
commit 52342327c7e566a25bf69dc6df651de45959e6d6 Author: Nick Mathewson Date: Mon Sep 2 14:49:53 2019 -0400 madvise: tolerate EINVAL and ENOSYS These errors can occur if we are built on a system with support for madvise(MADV_NOFORK) but then we are run on a system whose kernel

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

2019-09-17 Thread nickm
commit 48afec91ce4121fac76f2bae9c822f7195c6b819 Merge: 48b281587 c6f794326 Author: Nick Mathewson Date: Tue Sep 17 19:05:13 2019 -0400 Merge branch 'maint-0.4.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2019-09-17 Thread nickm
commit ca5e2caf53bf678954d051d8dec469bf6eede0b9 Merge: a32646c2e c6f794326 Author: Nick Mathewson Date: Tue Sep 17 19:05:04 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug31570 | 5 + src/lib/malloc/map_anon.c | 12 +++- 2 files changed, 16

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

2019-09-17 Thread nickm
commit c6f7943269c36be41d7c22ebb38eccc37357022b Merge: 50f981719 52342327c Author: Nick Mathewson Date: Tue Sep 17 19:04:25 2019 -0400 Merge branch 'bug31570_041' into maint-0.4.1 changes/bug31570 | 5 + src/lib/malloc/map_anon.c | 12 +++- 2 files changed, 16

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

2019-09-17 Thread nickm
commit c6f7943269c36be41d7c22ebb38eccc37357022b Merge: 50f981719 52342327c Author: Nick Mathewson Date: Tue Sep 17 19:04:25 2019 -0400 Merge branch 'bug31570_041' into maint-0.4.1 changes/bug31570 | 5 + src/lib/malloc/map_anon.c | 12 +++- 2 files changed, 16

[tor-commits] [tor/maint-0.4.1] madvise: tolerate EINVAL and ENOSYS

2019-09-17 Thread nickm
commit 52342327c7e566a25bf69dc6df651de45959e6d6 Author: Nick Mathewson Date: Mon Sep 2 14:49:53 2019 -0400 madvise: tolerate EINVAL and ENOSYS These errors can occur if we are built on a system with support for madvise(MADV_NOFORK) but then we are run on a system whose kernel

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

2019-09-17 Thread nickm
commit c6f7943269c36be41d7c22ebb38eccc37357022b Merge: 50f981719 52342327c Author: Nick Mathewson Date: Tue Sep 17 19:04:25 2019 -0400 Merge branch 'bug31570_041' into maint-0.4.1 changes/bug31570 | 5 + src/lib/malloc/map_anon.c | 12 +++- 2 files changed, 16

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

2019-09-17 Thread nickm
commit 860837af822ff046a19de299601db6c70f15da17 Merge: 03c3fa456 dc41e6a80 Author: Nick Mathewson Date: Tue Sep 17 18:58:43 2019 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files changed, 7 insertions(+),

[tor-commits] [tor/release-0.4.1] build: The is now deprecated on Linux

2019-09-17 Thread nickm
commit 484710f25be73d18fefa1e03339c9247e8ec7337 Author: David Goulet Date: Mon Sep 9 11:47:37 2019 -0400 build: The is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/common/compat.c | 8 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff

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

2019-09-17 Thread nickm
commit ef35435584c529906d385b0ce532aa6e43205608 Merge: 34bab120d dc41e6a80 Author: Nick Mathewson Date: Tue Sep 17 18:58:43 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files changed, 7 insertions(+), 3

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

2019-09-17 Thread nickm
commit 2ebe1fcd52778ea2d305331f4283366eb35c9d93 Merge: 97f7efa9e 484710f25 Author: Nick Mathewson Date: Tue Sep 17 18:57:49 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 "ours" merge to avoid picking up 0.2.9 version of ticket 31673.

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

2019-09-17 Thread nickm
commit 2ebe1fcd52778ea2d305331f4283366eb35c9d93 Merge: 97f7efa9e 484710f25 Author: Nick Mathewson Date: Tue Sep 17 18:57:49 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 "ours" merge to avoid picking up 0.2.9 version of ticket 31673.

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

2019-09-17 Thread nickm
commit 48b2815879fd43a87de5ecabf1e6fdd79c0b127c Merge: dcd646260 50f981719 Author: Nick Mathewson Date: Tue Sep 17 18:58:44 2019 -0400 Merge branch 'maint-0.4.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2019-09-17 Thread nickm
commit dc41e6a80cc7df8d8f2b3ff91be2da38242c541d Merge: 2ebe1fcd5 409df19b5 Author: Nick Mathewson Date: Tue Sep 17 18:58:06 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files

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

2019-09-17 Thread nickm
commit 50f981719f1bc7066496bcc4ef78fcdbb1ff1806 Merge: cec42be57 ef3543558 Author: Nick Mathewson Date: Tue Sep 17 18:58:44 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files changed, 7 insertions(+), 3

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

2019-09-17 Thread nickm
commit ef35435584c529906d385b0ce532aa6e43205608 Merge: 34bab120d dc41e6a80 Author: Nick Mathewson Date: Tue Sep 17 18:58:43 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files changed, 7 insertions(+), 3

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

2019-09-17 Thread nickm
commit 2ebe1fcd52778ea2d305331f4283366eb35c9d93 Merge: 97f7efa9e 484710f25 Author: Nick Mathewson Date: Tue Sep 17 18:57:49 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 "ours" merge to avoid picking up 0.2.9 version of ticket 31673.

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

2019-09-17 Thread nickm
commit dc41e6a80cc7df8d8f2b3ff91be2da38242c541d Merge: 2ebe1fcd5 409df19b5 Author: Nick Mathewson Date: Tue Sep 17 18:58:06 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files

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

2019-09-17 Thread nickm
commit dc41e6a80cc7df8d8f2b3ff91be2da38242c541d Merge: 2ebe1fcd5 409df19b5 Author: Nick Mathewson Date: Tue Sep 17 18:58:06 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files

[tor-commits] [tor/release-0.3.5] build: The is now deprecated on Linux

2019-09-17 Thread nickm
commit 409df19b5a0053175f05851086e6ef35c5bce2c0 Author: David Goulet Date: Mon Sep 9 11:55:33 2019 -0400 build: The is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files changed, 7 insertions(+), 3

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

2019-09-17 Thread nickm
commit a32646c2ed8a19e5061df4b57d0c27efe6bc357d Merge: c76907b54 50f981719 Author: Nick Mathewson Date: Tue Sep 17 18:58:44 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files changed, 7 insertions(+),

[tor-commits] [tor/master] build: The is now deprecated on Linux

2019-09-17 Thread nickm
commit 484710f25be73d18fefa1e03339c9247e8ec7337 Author: David Goulet Date: Mon Sep 9 11:47:37 2019 -0400 build: The is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/common/compat.c | 8 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff

[tor-commits] [tor/release-0.2.9] build: The is now deprecated on Linux

2019-09-17 Thread nickm
commit 484710f25be73d18fefa1e03339c9247e8ec7337 Author: David Goulet Date: Mon Sep 9 11:47:37 2019 -0400 build: The is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/common/compat.c | 8 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff

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

2019-09-17 Thread nickm
commit 1f19b5528f90eed57fdb4a7385eea14a6e5e84de Merge: 7b348e2ef ef3543558 Author: Nick Mathewson Date: Tue Sep 17 18:58:43 2019 -0400 Merge branch 'maint-0.4.0' into release-0.4.0 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files changed, 7 insertions(+),

[tor-commits] [tor/release-0.4.1] build: The is now deprecated on Linux

2019-09-17 Thread nickm
commit 409df19b5a0053175f05851086e6ef35c5bce2c0 Author: David Goulet Date: Mon Sep 9 11:55:33 2019 -0400 build: The is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files changed, 7 insertions(+), 3

[tor-commits] [tor/release-0.4.0] build: The is now deprecated on Linux

2019-09-17 Thread nickm
commit 409df19b5a0053175f05851086e6ef35c5bce2c0 Author: David Goulet Date: Mon Sep 9 11:55:33 2019 -0400 build: The is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files changed, 7 insertions(+), 3

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

2019-09-17 Thread nickm
commit 2ebe1fcd52778ea2d305331f4283366eb35c9d93 Merge: 97f7efa9e 484710f25 Author: Nick Mathewson Date: Tue Sep 17 18:57:49 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 "ours" merge to avoid picking up 0.2.9 version of ticket 31673.

[tor-commits] [tor/release-0.4.0] build: The is now deprecated on Linux

2019-09-17 Thread nickm
commit 484710f25be73d18fefa1e03339c9247e8ec7337 Author: David Goulet Date: Mon Sep 9 11:47:37 2019 -0400 build: The is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/common/compat.c | 8 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff

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

2019-09-17 Thread nickm
commit ef35435584c529906d385b0ce532aa6e43205608 Merge: 34bab120d dc41e6a80 Author: Nick Mathewson Date: Tue Sep 17 18:58:43 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files changed, 7 insertions(+), 3

  1   2   3   >