[tor-commits] [torspec/master] dir-spec: Fix a typo in subprotocol version voting

2020-02-12 Thread teor
commit 0e44723e90e0a00b4655635061c0a0e36c7185d1 Author: teor Date: Wed Feb 12 19:56:05 2020 +1000 dir-spec: Fix a typo in subprotocol version voting --- dir-spec.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 1a7a1cd..169985d 1

[tor-commits] [tor/master] protover: Update a comment about protover parsing

2020-02-12 Thread teor
commit bc493ce0f2130c5f2bc37e62600c45665ffc9d57 Author: teor Date: Wed Feb 12 20:59:25 2020 +1000 protover: Update a comment about protover parsing Comment-only change. --- src/core/or/protover.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/or/p

[tor-commits] [tpo/master] Add new Tor Browser version: 9.0.5

2020-02-12 Thread boklm
commit e438d061c422e8e864af2fa478e96a2c9de89ec4 Author: Nicolas Vigier Date: Wed Feb 12 12:11:29 2020 +0100 Add new Tor Browser version: 9.0.5 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 4 databags/versions.ini | 4 ++-

[tor-commits] [tor/master] scripts/git: Stop running the checked-out git scripts

2020-02-12 Thread nickm
commit 99d957696b3274a334448f066ba418b51cc887ee Author: teor Date: Wed Feb 12 20:32:58 2020 +1000 scripts/git: Stop running the checked-out git scripts Stop executing the checked-out pre-commit hook from the pre-push hook. Instead, execute the copy in the user's git dir.

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1726/head'

2020-02-12 Thread nickm
commit 9b2e0604a92aa319b78f3c7a395b83698ab0 Merge: bc493ce0f 99d957696 Author: Nick Mathewson Date: Wed Feb 12 08:34:17 2020 -0500 Merge remote-tracking branch 'tor-github/pr/1726/head' changes/bug33284 | 4 scripts/git/pre-push.git-hook | 9 +++-- 2 files change

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

2020-02-12 Thread translation
commit 70d42fd5cbe9505905c0148df749d67c71386da4 Author: Translation commit bot Date: Wed Feb 12 16:50:12 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+mk.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/co

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

2020-02-12 Thread translation
commit 7e0e97ba6c6a67586cd19f4a18628d97bff93fbf Author: Translation commit bot Date: Wed Feb 12 16:53:23 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+mk.po | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/contents+mk.po

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

2020-02-12 Thread translation
commit 48c6a32190018b8284e82d500366bd328dfa1090 Author: Translation commit bot Date: Wed Feb 12 17:15:36 2020 + https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot --- locale/mk/LC_MESSAGES/messages.po | 23 +++ 1 file changed, 11 insert

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

2020-02-12 Thread translation
commit 8cc047269df3e9325ac66a61c44a9d0cd7c6cf1c Author: Translation commit bot Date: Wed Feb 12 17:23:25 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+mk.po | 16 ++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/conte

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

2020-02-12 Thread translation
commit 457a7056134e7bd7dca1f51770b3b141fd707a65 Author: Translation commit bot Date: Wed Feb 12 17:45:35 2020 + https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot --- locale/mk/LC_MESSAGES/messages.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(

[tor-commits] [tor/release-0.4.3] Alphabetized Server Options and Directory Server Options

2020-02-12 Thread nickm
commit 725b0528e3c0d65c5b76dcf7ade7162d666290f8 Author: swati Date: Tue Feb 11 01:41:43 2020 +0530 Alphabetized Server Options and Directory Server Options --- doc/tor.1.txt | 632 ++ 1 file changed, 322 insertions(+), 310 deletions(-

[tor-commits] [tor/release-0.4.3] Lowercase the BridgeDistribution value from torrc in descriptors.

2020-02-12 Thread nickm
commit b9c7c61ea5233854ff83257a8bc530b7e0a50351 Author: Alexander Færøy Date: Wed Jan 15 17:18:30 2020 + Lowercase the BridgeDistribution value from torrc in descriptors. This patch ensures that we always lowercase the BridgeDistribution from torrc in descriptors before s

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1728/head' into maint-0.4.3

2020-02-12 Thread nickm
commit 3147cbba52c3986c3f59101a7199dc73076d2b00 Merge: e0ea7407a 0ab859aab Author: Nick Mathewson Date: Wed Feb 12 13:48:39 2020 -0500 Merge remote-tracking branch 'tor-github/pr/1728/head' into maint-0.4.3 changes/ticket33188 | 5 + doc/tor.1.txt | 630 ++-

[tor-commits] [tor/master] Moved [[RephistTrackTime]] to General Options.

2020-02-12 Thread nickm
commit d33c80f0ee3a6c88c911441673c39c1f266e2209 Author: swati Date: Wed Feb 12 23:17:31 2020 +0530 Moved [[RephistTrackTime]] to General Options. --- doc/tor.1.txt | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 87b327b9c..

[tor-commits] [tor/maint-0.4.3] Moved [[RephistTrackTime]] to General Options.

2020-02-12 Thread nickm
commit d33c80f0ee3a6c88c911441673c39c1f266e2209 Author: swati Date: Wed Feb 12 23:17:31 2020 +0530 Moved [[RephistTrackTime]] to General Options. --- doc/tor.1.txt | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 87b327b9c..

[tor-commits] [tor/maint-0.4.3] Alphabetized Server Options and Directory Server Options

2020-02-12 Thread nickm
commit 725b0528e3c0d65c5b76dcf7ade7162d666290f8 Author: swati Date: Tue Feb 11 01:41:43 2020 +0530 Alphabetized Server Options and Directory Server Options --- doc/tor.1.txt | 632 ++ 1 file changed, 322 insertions(+), 310 deletions(-

[tor-commits] [tor/release-0.4.3] Addressed minor changes suggested in the ticket

2020-02-12 Thread nickm
commit 809090d24d8576258fab6077e5e54e33e5c78bbe Author: swati Date: Wed Feb 12 23:07:00 2020 +0530 Addressed minor changes suggested in the ticket --- doc/tor.1.txt | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt in

[tor-commits] [tor/master] Addressed minor changes suggested in the ticket

2020-02-12 Thread nickm
commit 809090d24d8576258fab6077e5e54e33e5c78bbe Author: swati Date: Wed Feb 12 23:07:00 2020 +0530 Addressed minor changes suggested in the ticket --- doc/tor.1.txt | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt in

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

2020-02-12 Thread nickm
commit 88723ad1694a96bdbb713ccb5bb47a9f5acdc8bd Merge: 2b6df3da2 9d771ccc8 Author: teor Date: Wed Feb 12 12:18:59 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1689' into maint-0.3.5 .travis.yml | 2 -- changes/ticket33075 | 4 2 files changed, 4 insertions(+), 2 del

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

2020-02-12 Thread nickm
commit 3147cbba52c3986c3f59101a7199dc73076d2b00 Merge: e0ea7407a 0ab859aab Author: Nick Mathewson Date: Wed Feb 12 13:48:39 2020 -0500 Merge remote-tracking branch 'tor-github/pr/1728/head' into maint-0.4.3 changes/ticket33188 | 5 + doc/tor.1.txt | 630 ++-

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

2020-02-12 Thread nickm
commit 3147cbba52c3986c3f59101a7199dc73076d2b00 Merge: e0ea7407a 0ab859aab Author: Nick Mathewson Date: Wed Feb 12 13:48:39 2020 -0500 Merge remote-tracking branch 'tor-github/pr/1728/head' into maint-0.4.3 changes/ticket33188 | 5 + doc/tor.1.txt | 630 ++-

[tor-commits] [tor/maint-0.4.3] Addressed minor changes suggested in the ticket

2020-02-12 Thread nickm
commit 809090d24d8576258fab6077e5e54e33e5c78bbe Author: swati Date: Wed Feb 12 23:07:00 2020 +0530 Addressed minor changes suggested in the ticket --- doc/tor.1.txt | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt in

[tor-commits] [tor/release-0.4.3] changes file for ticket 33188

2020-02-12 Thread nickm
commit 0ab859aabecf025dc9adb14d440605a477ce251f Author: Taylor Yu Date: Wed Feb 12 12:28:35 2020 -0600 changes file for ticket 33188 --- changes/ticket33188 | 5 + 1 file changed, 5 insertions(+) diff --git a/changes/ticket33188 b/changes/ticket33188 new file mode 100644 index 000

[tor-commits] [tor/master] Alphabetized Server Options and Directory Server Options

2020-02-12 Thread nickm
commit 725b0528e3c0d65c5b76dcf7ade7162d666290f8 Author: swati Date: Tue Feb 11 01:41:43 2020 +0530 Alphabetized Server Options and Directory Server Options --- doc/tor.1.txt | 632 ++ 1 file changed, 322 insertions(+), 310 deletions(-

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

2020-02-12 Thread nickm
commit ff52205362f5d60c209f298a3e3679bc65bdf539 Merge: 00fe21472 5298113da Author: teor Date: Wed Feb 12 12:22:04 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .travis.yml| 2 -- changes/bug32753 | 3 +++ changes/ticket33075| 4 src/app/c

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

2020-02-12 Thread nickm
commit 0e00d9369fa159bf0c44d0862e3d1f6b0c40ef50 Merge: de31c4757 ff5220536 Author: teor Date: Wed Feb 12 14:13:15 2020 +1000 Merge branch 'maint-0.4.2' into maint-0.4.3 "ours" merge, because simiar BridgeDistribution fixes have already been merged to maint-0.4.3. (See 32753.)

[tor-commits] [tor/release-0.4.3] hs-v3: Remove BUG() that can occur normally

2020-02-12 Thread nickm
commit 88489cd29006f093e1a5572711b26ee1b057e359 Author: David Goulet Date: Tue Feb 4 10:13:10 2020 -0500 hs-v3: Remove BUG() that can occur normally Fixes #28992 Signed-off-by: David Goulet --- changes/ticket28992| 3 +++ src/feature/hs/hs_client.c | 11

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

2020-02-12 Thread nickm
commit e0ea7407a4370c977ebbf0b70712c9e5ff7937fa Merge: 0e00d9369 88489cd29 Author: teor Date: Wed Feb 12 14:14:11 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1725' into maint-0.4.3 changes/ticket28992| 3 +++ src/feature/hs/hs_client.c | 11 --- 2 files changed

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

2020-02-12 Thread nickm
commit 553c36d15354c4ffa90ef995f4a0b334b352fa45 Merge: 9b2e0604a 3147cbba5 Author: Nick Mathewson Date: Wed Feb 12 13:48:48 2020 -0500 Merge branch 'maint-0.4.3' changes/ticket33188 | 5 + doc/tor.1.txt | 630 ++-- 2 files changed, 3

[tor-commits] [tor/maint-0.4.3] changes file for ticket 33188

2020-02-12 Thread nickm
commit 0ab859aabecf025dc9adb14d440605a477ce251f Author: Taylor Yu Date: Wed Feb 12 12:28:35 2020 -0600 changes file for ticket 33188 --- changes/ticket33188 | 5 + 1 file changed, 5 insertions(+) diff --git a/changes/ticket33188 b/changes/ticket33188 new file mode 100644 index 000

[tor-commits] [tor/master] changes file for ticket 33188

2020-02-12 Thread nickm
commit 0ab859aabecf025dc9adb14d440605a477ce251f Author: Taylor Yu Date: Wed Feb 12 12:28:35 2020 -0600 changes file for ticket 33188 --- changes/ticket33188 | 5 + 1 file changed, 5 insertions(+) diff --git a/changes/ticket33188 b/changes/ticket33188 new file mode 100644 index 000

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

2020-02-12 Thread nickm
commit 5298113da98f13cfaad4a9ab7b5ac8baa6c37279 Merge: 0ff3e8f4a b9c7c61ea Author: teor Date: Wed Feb 12 12:21:57 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.1 .travis.yml| 2 -- changes/bug32753 | 3 +++ changes/ticket33075| 4 src/app/c

[tor-commits] [tor/release-0.4.3] Moved [[RephistTrackTime]] to General Options.

2020-02-12 Thread nickm
commit d33c80f0ee3a6c88c911441673c39c1f266e2209 Author: swati Date: Wed Feb 12 23:17:31 2020 +0530 Moved [[RephistTrackTime]] to General Options. --- doc/tor.1.txt | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 87b327b9c..

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

2020-02-12 Thread nickm
commit d0c3350218765d43c538df4dd1d548fa9a7c430a Author: Nick Mathewson Date: Wed Feb 12 18:25:51 2020 -0500 Run "make autostyle". --- src/feature/dirauth/process_descs.h | 6 +++--- src/feature/dircache/dirserv.h | 4 ++-- src/feature/nodelist/networkstatus.c | 2 +- src/lib/cc/comp

[tor-commits] [tor/maint-0.4.3] Run "make autostyle".

2020-02-12 Thread nickm
commit d0c3350218765d43c538df4dd1d548fa9a7c430a Author: Nick Mathewson Date: Wed Feb 12 18:25:51 2020 -0500 Run "make autostyle". --- src/feature/dirauth/process_descs.h | 6 +++--- src/feature/dircache/dirserv.h | 4 ++-- src/feature/nodelist/networkstatus.c | 2 +- src/lib/cc/comp

[tor-commits] [tor/release-0.4.3] Run "make autostyle".

2020-02-12 Thread nickm
commit d0c3350218765d43c538df4dd1d548fa9a7c430a Author: Nick Mathewson Date: Wed Feb 12 18:25:51 2020 -0500 Run "make autostyle". --- src/feature/dirauth/process_descs.h | 6 +++--- src/feature/dircache/dirserv.h | 4 ++-- src/feature/nodelist/networkstatus.c | 2 +- src/lib/cc/comp

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

2020-02-12 Thread nickm
commit e231d84dd571b732f70f5ddd23a9274027d84b88 Merge: 553c36d15 d0c335021 Author: Nick Mathewson Date: Wed Feb 12 18:26:08 2020 -0500 Merge branch 'maint-0.4.3' src/feature/dirauth/process_descs.h | 6 +++--- src/feature/dircache/dirserv.h | 4 ++-- src/feature/nodelist/networksta

[tor-commits] [chutney/master] networks: Make bridges+hs-v23 actually work

2020-02-12 Thread teor
commit 7533b1d920f08db98642e564a4df3b43b0b78d3d Author: teor Date: Thu Feb 13 12:37:50 2020 +1000 networks: Make bridges+hs-v23 actually work Part of 33302. --- networks/bridges+hs-v23 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/networks/bridges+hs-v2

[tor-commits] [chutney/master] Ticket 33304 - Return None for pid when pid file is empty

2020-02-12 Thread teor
commit 185852f602ccd9168d7b7d5d13ad060feaa7a57d Author: Steven Engler Date: Wed Feb 12 23:59:47 2020 -0500 Ticket 33304 - Return None for pid when pid file is empty --- lib/chutney/TorNet.py | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib

[tor-commits] [chutney/master] TorNet: Avoid corefile name errors

2020-02-12 Thread teor
commit 2dabf64354fa6f6ce26233fe00f92f1d2a097360 Author: teor Date: Thu Feb 13 16:56:44 2020 +1000 TorNet: Avoid corefile name errors Stop using None pids to make corefile names when checking if tor has crashed. Cleanup after 33304. --- lib/chutney/TorNet.py | 6 --