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

2018-01-02 Thread nickm
commit bd9739bae6230440c07fc67174ad37f019dfc412 Merge: bc5ef83f8 2aa1767b2 Author: Nick Mathewson Date: Tue Jan 2 14:42:31 2018 -0500 Merge branch 'maint-0.3.2' src/config/torrc.minimal.in-staging | 6 +- src/config/torrc.sample.in | 13 +++-- 2 files changed, 16 ins

[tor-commits] [tor/release-0.3.2] Clarify the OutboundBindAddressOR documentation in the sample torrc

2018-01-02 Thread nickm
commit d10c2d66686180f774ae946e7dc65070dd33cac1 Author: teor Date: Fri Dec 22 11:22:10 2017 +1100 Clarify the OutboundBindAddressOR documentation in the sample torrc Part of 22145 --- src/config/torrc.sample.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/

[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'teor/bug24703_032' into maint-0.3.2

2018-01-02 Thread nickm
commit 2aa1767b25e6b2b04892696c4c00e0257feb3812 Merge: 707076002 a8e8ce860 Author: Nick Mathewson Date: Tue Jan 2 14:42:27 2018 -0500 Merge remote-tracking branch 'teor/bug24703_032' into maint-0.3.2 src/config/torrc.minimal.in-staging | 6 +- src/config/torrc.sample.in | 13

[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'teor/bug24703_032' into maint-0.3.2

2018-01-02 Thread nickm
commit 2aa1767b25e6b2b04892696c4c00e0257feb3812 Merge: 707076002 a8e8ce860 Author: Nick Mathewson Date: Tue Jan 2 14:42:27 2018 -0500 Merge remote-tracking branch 'teor/bug24703_032' into maint-0.3.2 src/config/torrc.minimal.in-staging | 6 +- src/config/torrc.sample.in | 13

[tor-commits] [tor/master] Bump the dates and Tor versions on the sample torrcs

2018-01-02 Thread nickm
commit a8e8ce8602b688cdf411e372e1b7458c76344373 Author: teor Date: Fri Dec 22 11:22:48 2017 +1100 Bump the dates and Tor versions on the sample torrcs --- src/config/torrc.minimal.in-staging | 2 +- src/config/torrc.sample.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-

[tor-commits] [tor/maint-0.3.2] Clarify the OutboundBindAddressOR documentation in the sample torrc

2018-01-02 Thread nickm
commit d10c2d66686180f774ae946e7dc65070dd33cac1 Author: teor Date: Fri Dec 22 11:22:10 2017 +1100 Clarify the OutboundBindAddressOR documentation in the sample torrc Part of 22145 --- src/config/torrc.sample.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/

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

2018-01-02 Thread nickm
commit 99b4f868332b3ae304e669240657994022d69991 Merge: fd46d8d0a 2aa1767b2 Author: Nick Mathewson Date: Tue Jan 2 14:42:31 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/config/torrc.minimal.in-staging | 6 +- src/config/torrc.sample.in | 13 +++-- 2 fi

[tor-commits] [tor/maint-0.3.2] Document IPv6Exit in the sample torrcs

2018-01-02 Thread nickm
commit 5fb26ba2d8d96479a42b1ac286129351a0d09b92 Author: teor Date: Fri Dec 22 11:10:30 2017 +1100 Document IPv6Exit in the sample torrcs Sample config-only change. Implements 24703. --- src/config/torrc.minimal.in-staging | 4 src/config/torrc.sample.in | 8

[tor-commits] [tor/master] Clarify the OutboundBindAddressOR documentation in the sample torrc

2018-01-02 Thread nickm
commit d10c2d66686180f774ae946e7dc65070dd33cac1 Author: teor Date: Fri Dec 22 11:22:10 2017 +1100 Clarify the OutboundBindAddressOR documentation in the sample torrc Part of 22145 --- src/config/torrc.sample.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/

[tor-commits] [tor/release-0.3.2] Document IPv6Exit in the sample torrcs

2018-01-02 Thread nickm
commit 5fb26ba2d8d96479a42b1ac286129351a0d09b92 Author: teor Date: Fri Dec 22 11:10:30 2017 +1100 Document IPv6Exit in the sample torrcs Sample config-only change. Implements 24703. --- src/config/torrc.minimal.in-staging | 4 src/config/torrc.sample.in | 8

[tor-commits] [tor/release-0.3.2] Bump the dates and Tor versions on the sample torrcs

2018-01-02 Thread nickm
commit a8e8ce8602b688cdf411e372e1b7458c76344373 Author: teor Date: Fri Dec 22 11:22:48 2017 +1100 Bump the dates and Tor versions on the sample torrcs --- src/config/torrc.minimal.in-staging | 2 +- src/config/torrc.sample.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-

[tor-commits] [tor/master] Document IPv6Exit in the sample torrcs

2018-01-02 Thread nickm
commit 5fb26ba2d8d96479a42b1ac286129351a0d09b92 Author: teor Date: Fri Dec 22 11:10:30 2017 +1100 Document IPv6Exit in the sample torrcs Sample config-only change. Implements 24703. --- src/config/torrc.minimal.in-staging | 4 src/config/torrc.sample.in | 8

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug24703_032' into maint-0.3.2

2018-01-02 Thread nickm
commit 2aa1767b25e6b2b04892696c4c00e0257feb3812 Merge: 707076002 a8e8ce860 Author: Nick Mathewson Date: Tue Jan 2 14:42:27 2018 -0500 Merge remote-tracking branch 'teor/bug24703_032' into maint-0.3.2 src/config/torrc.minimal.in-staging | 6 +- src/config/torrc.sample.in | 13

[tor-commits] [tor/maint-0.3.2] Bump the dates and Tor versions on the sample torrcs

2018-01-02 Thread nickm
commit a8e8ce8602b688cdf411e372e1b7458c76344373 Author: teor Date: Fri Dec 22 11:22:48 2017 +1100 Bump the dates and Tor versions on the sample torrcs --- src/config/torrc.minimal.in-staging | 2 +- src/config/torrc.sample.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-

[tor-commits] [webwml/master] Bug 24697: Remove expired Mozilla matching text

2018-01-02 Thread hiro
commit 47a6ab07ff77aca59eb097f458003f233f93519a Author: Arthur Edelstein Date: Mon Jan 1 13:49:06 2018 -0500 Bug 24697: Remove expired Mozilla matching text --- css/donation-banner.css | 14 -- include/head.wmi| 1 - 2 files changed, 15 deletions(-) diff --git a/css/d

[tor-commits] [webwml/master] Merge branch 'master' into 24697

2018-01-02 Thread hiro
commit 5f57207af84078147438019516ca912c698404f7 Merge: 47a6ab07 509f2fd5 Author: hiromipaw Date: Tue Jan 2 19:41:47 2018 +0100 Merge branch 'master' into 24697 include/mirrors-table.wmi | 538 ++ include/tor-mirrors.csv | 185

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2018-01-02 Thread translation
commit 3f50707c1ec0cf788c67f5217088a8c52ada58f2 Author: Translation commit bot Date: Tue Jan 2 17:15:58 2018 + Update translations for liveusb-creator --- th/th.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/th/th.po b/th/th.po index 19b52ee41..1db08126a 100

[tor-commits] [compass/master] Redirect all queries to Relay Search

2018-01-02 Thread karsten
commit d66c8e97cad060f9f7479773b29f220ed49638d8 Author: Iain R. Learmonth Date: Tue Nov 28 22:11:35 2017 + Redirect all queries to Relay Search --- app.py | 58 +--- static/js/angularize.js | 86 ++-- templates/index.html| 173

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2018-01-02 Thread translation
commit ecda4fefe52a05c106a53c9ea4d38d80adb87fa4 Author: Translation commit bot Date: Tue Jan 2 15:15:54 2018 + Update translations for liveusb-creator --- th/th.po | 56 1 file changed, 28 insertions(+), 28 deletions(-) diff --g

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

2018-01-02 Thread nickm
commit fb5877b9721dcc0d140c2c7c8d16d0b656bbf5d7 Merge: 08469a338 8a7767603 Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) __

[tor-commits] [tor/release-0.3.1] Clear the address when we can't choose a reachable address

2018-01-02 Thread nickm
commit 09b9a35c07a35c0891f8cb10406c113155740d18 Author: teor Date: Mon Dec 25 01:53:14 2017 +1100 Clear the address when we can't choose a reachable address When the fascist_firewall_choose_address_ functions don't find a reachable address, set the returned address to the null

[tor-commits] [tor/release-0.3.1] Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

2018-01-02 Thread nickm
commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3 Merge: 79a50afa0 09b9a35c0 Author: Nick Mathewson Date: Tue Jan 2 10:09:44 2018 -0500 Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

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

2018-01-02 Thread nickm
commit fd46d8d0ad9e976cdae7676e9f27f572b78ac959 Merge: 11336cfa0 707076002 Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) ___

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

2018-01-02 Thread nickm
commit 698e4a4780a717083e713ee0cf1f3a744f7087d7 Merge: bcf033047 8a7767603 Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) ___

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

2018-01-02 Thread nickm
commit 707076002d4db2b8b2e6f05bea86316674bf9f45 Merge: 94c59851d fb5877b97 Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) __

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

2018-01-02 Thread nickm
commit 8a7767603a9ac826f39505fc9ea8c08385f6dfd6 Merge: 03b4dd92a 6e5e4f92a Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) __

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

2018-01-02 Thread nickm
commit 8a7767603a9ac826f39505fc9ea8c08385f6dfd6 Merge: 03b4dd92a 6e5e4f92a Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) __

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1

2018-01-02 Thread nickm
commit fb5877b9721dcc0d140c2c7c8d16d0b656bbf5d7 Merge: 08469a338 8a7767603 Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) __

[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

2018-01-02 Thread nickm
commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3 Merge: 79a50afa0 09b9a35c0 Author: Nick Mathewson Date: Tue Jan 2 10:09:44 2018 -0500 Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

[tor-commits] [tor/release-0.3.2] Clear the address when we can't choose a reachable address

2018-01-02 Thread nickm
commit 09b9a35c07a35c0891f8cb10406c113155740d18 Author: teor Date: Mon Dec 25 01:53:14 2017 +1100 Clear the address when we can't choose a reachable address When the fascist_firewall_choose_address_ functions don't find a reachable address, set the returned address to the null

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

2018-01-02 Thread nickm
commit a8a060cdb329eff865928da5a5e19fa4f6cba021 Merge: 45b1c6bc8 fb5877b97 Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) ___

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

2018-01-02 Thread nickm
commit 8a7767603a9ac826f39505fc9ea8c08385f6dfd6 Merge: 03b4dd92a 6e5e4f92a Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) __

[tor-commits] [tor/release-0.3.0] Clear the address when we can't choose a reachable address

2018-01-02 Thread nickm
commit 09b9a35c07a35c0891f8cb10406c113155740d18 Author: teor Date: Mon Dec 25 01:53:14 2017 +1100 Clear the address when we can't choose a reachable address When the fascist_firewall_choose_address_ functions don't find a reachable address, set the returned address to the null

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

2018-01-02 Thread nickm
commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3 Merge: 79a50afa0 09b9a35c0 Author: Nick Mathewson Date: Tue Jan 2 10:09:44 2018 -0500 Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

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

2018-01-02 Thread nickm
commit b2871cef91fbabd1dccdd8a424d5921948ab9d22 Merge: cbe36a739 6e5e4f92a Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) ___

[tor-commits] [tor/release-0.3.0] Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

2018-01-02 Thread nickm
commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3 Merge: 79a50afa0 09b9a35c0 Author: Nick Mathewson Date: Tue Jan 2 10:09:44 2018 -0500 Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-01-02 Thread nickm
commit 707076002d4db2b8b2e6f05bea86316674bf9f45 Merge: 94c59851d fb5877b97 Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) _

[tor-commits] [tor/release-0.2.9] Clear the address when we can't choose a reachable address

2018-01-02 Thread nickm
commit 09b9a35c07a35c0891f8cb10406c113155740d18 Author: teor Date: Mon Dec 25 01:53:14 2017 +1100 Clear the address when we can't choose a reachable address When the fascist_firewall_choose_address_ functions don't find a reachable address, set the returned address to the null

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

2018-01-02 Thread nickm
commit bc5ef83f8f960e9ccf0e8634301037e61d43f332 Merge: d53f77985 707076002 Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.3.2' changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) __

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

2018-01-02 Thread nickm
commit 8a7767603a9ac826f39505fc9ea8c08385f6dfd6 Merge: 03b4dd92a 6e5e4f92a Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) __

[tor-commits] [tor/release-0.2.9] Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

2018-01-02 Thread nickm
commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3 Merge: 79a50afa0 09b9a35c0 Author: Nick Mathewson Date: Tue Jan 2 10:09:44 2018 -0500 Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

[tor-commits] [tor/master] Clear the address when we can't choose a reachable address

2018-01-02 Thread nickm
commit 09b9a35c07a35c0891f8cb10406c113155740d18 Author: teor Date: Mon Dec 25 01:53:14 2017 +1100 Clear the address when we can't choose a reachable address When the fascist_firewall_choose_address_ functions don't find a reachable address, set the returned address to the null

[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-01-02 Thread nickm
commit 707076002d4db2b8b2e6f05bea86316674bf9f45 Merge: 94c59851d fb5877b97 Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) __

[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

2018-01-02 Thread nickm
commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3 Merge: 79a50afa0 09b9a35c0 Author: Nick Mathewson Date: Tue Jan 2 10:09:44 2018 -0500 Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

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

2018-01-02 Thread nickm
commit 8a7767603a9ac826f39505fc9ea8c08385f6dfd6 Merge: 03b4dd92a 6e5e4f92a Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) __

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1

2018-01-02 Thread nickm
commit fb5877b9721dcc0d140c2c7c8d16d0b656bbf5d7 Merge: 08469a338 8a7767603 Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) __

[tor-commits] [tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1

2018-01-02 Thread nickm
commit fb5877b9721dcc0d140c2c7c8d16d0b656bbf5d7 Merge: 08469a338 8a7767603 Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) __

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

2018-01-02 Thread nickm
commit fb5877b9721dcc0d140c2c7c8d16d0b656bbf5d7 Merge: 08469a338 8a7767603 Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) _

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

2018-01-02 Thread nickm
commit 8a7767603a9ac826f39505fc9ea8c08385f6dfd6 Merge: 03b4dd92a 6e5e4f92a Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) __

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

2018-01-02 Thread nickm
commit 8a7767603a9ac826f39505fc9ea8c08385f6dfd6 Merge: 03b4dd92a 6e5e4f92a Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) _

[tor-commits] [tor/maint-0.3.0] Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

2018-01-02 Thread nickm
commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3 Merge: 79a50afa0 09b9a35c0 Author: Nick Mathewson Date: Tue Jan 2 10:09:44 2018 -0500 Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

[tor-commits] [tor/maint-0.3.1] Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

2018-01-02 Thread nickm
commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3 Merge: 79a50afa0 09b9a35c0 Author: Nick Mathewson Date: Tue Jan 2 10:09:44 2018 -0500 Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

[tor-commits] [tor/maint-0.2.9] Clear the address when we can't choose a reachable address

2018-01-02 Thread nickm
commit 09b9a35c07a35c0891f8cb10406c113155740d18 Author: teor Date: Mon Dec 25 01:53:14 2017 +1100 Clear the address when we can't choose a reachable address When the fascist_firewall_choose_address_ functions don't find a reachable address, set the returned address to the null

[tor-commits] [tor/maint-0.2.9] Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

2018-01-02 Thread nickm
commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3 Merge: 79a50afa0 09b9a35c0 Author: Nick Mathewson Date: Tue Jan 2 10:09:44 2018 -0500 Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

[tor-commits] [tor/maint-0.3.1] Clear the address when we can't choose a reachable address

2018-01-02 Thread nickm
commit 09b9a35c07a35c0891f8cb10406c113155740d18 Author: teor Date: Mon Dec 25 01:53:14 2017 +1100 Clear the address when we can't choose a reachable address When the fascist_firewall_choose_address_ functions don't find a reachable address, set the returned address to the null

[tor-commits] [tor/maint-0.3.2] Clear the address when we can't choose a reachable address

2018-01-02 Thread nickm
commit 09b9a35c07a35c0891f8cb10406c113155740d18 Author: teor Date: Mon Dec 25 01:53:14 2017 +1100 Clear the address when we can't choose a reachable address When the fascist_firewall_choose_address_ functions don't find a reachable address, set the returned address to the null

[tor-commits] [tor/maint-0.3.0] Clear the address when we can't choose a reachable address

2018-01-02 Thread nickm
commit 09b9a35c07a35c0891f8cb10406c113155740d18 Author: teor Date: Mon Dec 25 01:53:14 2017 +1100 Clear the address when we can't choose a reachable address When the fascist_firewall_choose_address_ functions don't find a reachable address, set the returned address to the null

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/ticket24001'

2018-01-02 Thread nickm
commit d53f779853ee112ca152198f7695ac3b940719ae Merge: 996328f37 53f350182 Author: Nick Mathewson Date: Tue Jan 2 10:07:13 2018 -0500 Merge remote-tracking branch 'teor/ticket24001' changes/ticket24001 | 4 src/or/nodelist.c | 7 +++ 2 files changed, 11 insertions(+) _

[tor-commits] [tor/master] Expand comments in node_get_ed25519_id() and put them near the relevant code

2018-01-02 Thread nickm
commit 53f350182e60b32791b23ea98368a41037bffd0d Author: teor Date: Sun Dec 24 19:47:42 2017 +1100 Expand comments in node_get_ed25519_id() and put them near the relevant code And add a changes file. Follow-up to 24001. --- changes/ticket24001 | 4 src/or/nodelist.c

[tor-commits] [tor/master] Conditional check added

2018-01-02 Thread nickm
commit 5865e56ec083bbccd46bf71a9343b3744f0c4ecc Author: ArunaMaurya221B Date: Fri Dec 22 16:15:42 2017 +0530 Conditional check added --- src/or/nodelist.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/or/nodelist.c b/src/or/nodelist.c index e6eaefb21..042074998 100644 --- a/sr

[tor-commits] [tor/master] Stop trying to remove NULL filenames on shutdown

2018-01-02 Thread nickm
commit d99ccf090f5c5cb4ca76524a73c6fd7543fe969e Author: teor Date: Fri Dec 29 23:00:57 2017 +1100 Stop trying to remove NULL filenames on shutdown Fixes bug 24762; bugfix on master. (Not in any released version of Tor.) --- changes/bug24762 | 3 +++ src/or/main.c| 4 ++--

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug24762'

2018-01-02 Thread nickm
commit 2819e9467e229c2469b6fb0fd584f5cf020ffd3e Merge: 5051cfe9b d99ccf090 Author: Nick Mathewson Date: Tue Jan 2 09:54:56 2018 -0500 Merge remote-tracking branch 'teor/bug24762' changes/bug24762 | 3 +++ src/or/main.c| 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) _

[tor-commits] [tor/master] Remove changes file for 24762

2018-01-02 Thread nickm
commit 996328f374cb3f3b9820278b7e76ba1ee40dbfed Author: Nick Mathewson Date: Tue Jan 2 09:55:29 2018 -0500 Remove changes file for 24762 (Bugfixes for bugs not in any released Tor don't get listed in the changelog, and therefore don't need changes files.) --- changes/bug24762

[tor-commits] [tor/master] Merge remote-tracking branch 'ffmancera/github/bug24677'

2018-01-02 Thread nickm
commit 5051cfe9bd66aa68c6825c00e107f759c921a9ff Merge: f5d89fab2 3871c102a Author: Nick Mathewson Date: Tue Jan 2 09:37:23 2018 -0500 Merge remote-tracking branch 'ffmancera/github/bug24677' Makefile.am | 10 ++ changes/ticket24677 | 4 2 files changed, 10 insertions

[tor-commits] [tor/master] Use ping -6 ::1 on Linux when ping6 ::1 fails on tests.

2018-01-02 Thread nickm
commit 3871c102a6345484c5c49c91d324885bfde2e242 Author: Fernando Fernandez Mancera Date: Tue Jan 2 15:18:36 2018 +0100 Use ping -6 ::1 on Linux when ping6 ::1 fails on tests. Tor test now checks if "ping -6 -c 1 -W 1 ::1" works when "ping6 -c 1 -W 1 ::1" fails on tests.

[tor-commits] [torspec/master] reindex

2018-01-02 Thread nickm
commit a76eaa606b611a088739c0bb2557996a48c5f161 Author: Nick Mathewson Date: Tue Jan 2 09:30:01 2018 -0500 reindex --- proposals/000-index.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 22e3fec..6c6ae09 10

[tor-commits] [torspec/master] Update prop#283's Status to Accepted, and add Implemented-In and Ticket

2018-01-02 Thread nickm
commit 6ac960d4511df3622ec5196601f8d6f436799009 Author: teor Date: Tue Jan 2 13:07:27 2018 +1100 Update prop#283's Status to Accepted, and add Implemented-In and Ticket The code that implements prop#283 has been merged to master (0.3.3.0-alpha-dev). There is a small am

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2018-01-02 Thread translation
commit 4b95e3184e9ea1c8b8e60637e1035d8239a1 Author: Translation commit bot Date: Tue Jan 2 10:46:55 2018 + Update translations for tor-launcher-network-settings --- sv/network-settings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sv/network-settings

[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

2018-01-02 Thread translation
commit d8e0254ab23126187da78a29e5f1c98f3598b6e4 Author: Translation commit bot Date: Tue Jan 2 10:47:01 2018 + Update translations for tor-launcher-network-settings_completed --- sv/network-settings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sv/networ

[tor-commits] [webwml/master] another update-mirror run

2018-01-02 Thread arma
commit 509f2fd5c45148fdd921a5aa8cd4a9ce32bd165b Author: Roger Dingledine Date: Tue Jan 2 04:20:23 2018 -0500 another update-mirror run --- include/mirrors-table.wmi | 538 ++ include/tor-mirrors.csv | 188 2 files changed, 397

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2018-01-02 Thread translation
commit 228b9fe35b6e3506ea8aaecd28b53085a7bdb806 Author: Translation commit bot Date: Tue Jan 2 09:16:04 2018 + Update translations for tails-persistence-setup --- ro/ro.po | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ro/ro.po b/ro/ro.po index 9fdc12e39..

[tor-commits] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2018-01-02 Thread translation
commit 9a05fdcb6db32e447078b53db6b94c98822d3357 Author: Translation commit bot Date: Tue Jan 2 09:16:11 2018 + Update translations for tails-persistence-setup_completed --- ro/ro.po | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ro/ro.po b/ro/ro.p

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2018-01-02 Thread translation
commit d15d6ca6a8f986099aeb6b3e45aa066ce4d8e1a1 Author: Translation commit bot Date: Tue Jan 2 08:47:21 2018 + Update translations for tails-misc_completed --- ro.po | 13 + 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ro.po b/ro.po index 827735d67..b55df77

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2018-01-02 Thread translation
commit 8a94958381ffc65f2da31aa48ff643310b22913b Author: Translation commit bot Date: Tue Jan 2 08:47:13 2018 + Update translations for tails-misc --- ro.po | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ro.po b/ro.po index 9a1183d2d..b55df77b9 100644 --- a/r