December 2017 - tor-commits - lists.torproject.org

[webwml/master] Revert change to makefile.local.sample
by hiro＠torproject.org 26 Dec '17

26 Dec '17

commit 7758985ed2dca7a4fe43918b16a74d523d1d3665 Author: hiromipaw <hiro(a)torproject.org> Date: Tue Dec 26 12:03:00 2017 +0100 Revert change to makefile.local.sample --- Makefile.local.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.local.sample b/Makefile.local.sample index 48e6eacf..fb48555e 100644 --- a/Makefile.local.sample +++ b/Makefile.local.sample @@ -10,4 +10,4 @@ # # e.g.: # export TORGIT=/home/weasel/projects/tor/tor/.git -export TORGIT=/home/arthur/projects/tor/.git +export TORGIT=set this to your tor.git path \ No newline at end of file

1 0

[webwml/master] Bug 24673: Retire 'Browser Developers for Mobile (Android) posting
by hiro＠torproject.org 26 Dec '17

26 Dec '17

commit 253932f5790a4af91ef994ae604d40772fa7b9c0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Dec 19 18:40:30 2017 -0500 Bug 24673: Retire 'Browser Developers for Mobile (Android) posting --- about/en/jobs.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/jobs.wml b/about/en/jobs.wml index 38e225b9..514e7175 100644 --- a/about/en/jobs.wml +++ b/about/en/jobs.wml @@ -18,7 +18,6 @@ <p>Specifically, we're looking for the following people currently:</p> <ul> - <li><a href="<page about/jobs-developerandroid>">Browser Developers for Mobile (Android)</a></li> <li><a href="<page about/jobs-osdeveloperandroid>">Android OS Developer</a></li> </ul> @@ -35,6 +34,7 @@ <li>Director of Communications</li> <li>Executive Director</li> <li>Executive Administrator</li> + <li>Browser Developers for Mobile (Android)</li> </ul> <p>

1 0

[webwml/master] fix link to tipprbot
by hiro＠torproject.org 26 Dec '17

26 Dec '17

commit 048de3fe1091930a357509ad8563097a86612ac4 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Dec 24 12:04:17 2017 -0500 fix link to tipprbot --- Makefile.local.sample | 2 +- donate/en/donate-options.wml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.local.sample b/Makefile.local.sample index 737b5d79..48e6eacf 100644 --- a/Makefile.local.sample +++ b/Makefile.local.sample @@ -10,4 +10,4 @@ # # e.g.: # export TORGIT=/home/weasel/projects/tor/tor/.git -export TORGIT=set this to your tor.git path +export TORGIT=/home/arthur/projects/tor/.git diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 42d4a706..53513557 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -31,7 +31,7 @@ form#makeDonation { <div class="hundred toptwenty"> <div class="dbox donate"> <h3>Donate Bitcoin</h3> -<p>To donate Bitcoin to The Tor Project, please complete the form below. If you would like an acknowledgment from the Tor Project, please provide your email address. (Due to the current state of the Bitcoin market, our payment processor, Bitpay, will not allow us to accept donations of less than 100 USD. However, we can also accept donations, including smaller donations, through Bitcoin Cash. Send us a tip with <a href="https://twitter.com/tipperbot">@tipprbot</a> on Twitter!)</p> +<p>To donate Bitcoin to The Tor Project, please complete the form below. If you would like an acknowledgment from the Tor Project, please provide your email address. (Due to the current state of the Bitcoin market, our payment processor, Bitpay, will not allow us to accept donations of less than 100 USD. However, we can also accept donations, including smaller donations, through Bitcoin Cash. Send us a tip with <a href="https://twitter.com/tipprbot">@tipprbot</a> on Twitter!)</p> <form id="makeDonation" action="https://bitpay.com/checkout" method="post" onsubmit="return bp.validateMobileCheckoutForm($('#makeDonation'));"> <input name="action" type="hidden" value="checkout"> <fieldset class="phone-form well form-horizontal" style="margin-top: 5px;">

1 0

[webwml/master] Bug 24720: Update donation options page for BTC and stock transfers
by hiro＠torproject.org 26 Dec '17

26 Dec '17

commit 5e90acd53a5c553fd118df108139d80178b7ffd3 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Dec 22 18:10:34 2017 -0500 Bug 24720: Update donation options page for BTC and stock transfers --- donate/en/donate-options.wml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 5c18976c..42d4a706 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -31,7 +31,7 @@ form#makeDonation { <div class="hundred toptwenty"> <div class="dbox donate"> <h3>Donate Bitcoin</h3> -<p>To donate Bitcoin to The Tor Project, please complete the form below. If you would like an acknowledgment from the Tor Project, please provide your email address.</p> +<p>To donate Bitcoin to The Tor Project, please complete the form below. If you would like an acknowledgment from the Tor Project, please provide your email address. (Due to the current state of the Bitcoin market, our payment processor, Bitpay, will not allow us to accept donations of less than 100 USD. However, we can also accept donations, including smaller donations, through Bitcoin Cash. Send us a tip with <a href="https://twitter.com/tipperbot">@tipprbot</a> on Twitter!)</p> <form id="makeDonation" action="https://bitpay.com/checkout" method="post" onsubmit="return bp.validateMobileCheckoutForm($('#makeDonation'));"> <input name="action" type="hidden" value="checkout"> <fieldset class="phone-form well form-horizontal" style="margin-top: 5px;"> @@ -42,7 +42,7 @@ form#makeDonation { </li> <li id="price" class="control-group"> <label class="control-label" style="width: 80px">Amount:</label> - <input name="price" type="number" class="noscroll" value="10.00" placeholder="Amount" maxlength="10" min="0.01" step="0.01" /> + <input name="price" type="number" class="noscroll" value="100.00" placeholder="Amount" maxlength="10" min="100" step="0.01" /> <select name="currency" value="" > <option value="USD" selected="selected">USD</option> <option value="BTC">BTC</option> @@ -176,7 +176,7 @@ form#makeDonation { E-mail: <a href="mailto:jeffrey.k.miller@ml.com">jeffrey.k.miller(a)ml.com</a><br> FAX: 206.388.4456<br> The Tor Project Account #: 335-03016<br> - DTC #: 5198<br> + DTC #: 8862<br> Tax ID #: 20-8096820<br> </p> </p>

1 0

[webwml/master] Merge branch '24720'
by hiro＠torproject.org 26 Dec '17

26 Dec '17

commit e7c3af0bcbd96bd802cf7dedb40cabd0391053d6 Merge: 75fda3ec 2921d7c3 Author: hiromipaw <hiro(a)torproject.org> Date: Tue Dec 26 11:19:10 2017 +0100 Merge branch '24720' donate/en/.#donate-options.wml | 1 + donate/en/donate-options.wml | 4 ++++ 2 files changed, 5 insertions(+)

1 0

[webwml/master] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml into 24673
by hiro＠torproject.org 26 Dec '17

26 Dec '17

commit 75fda3eccd77d5f6926cc29af88df57c76a7752b Merge: 253932f5 232e4645 Author: hiromipaw <hiro(a)torproject.org> Date: Tue Dec 26 11:14:19 2017 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml into 24673 .htaccess | 3 ++- Makefile | 2 +- donate/en/donate-options.wml | 6 +++--- en/averyonionthankyou.wml | 11 +++++++++++ include/versions.wmi | 6 +++--- projects/torbrowser/RecommendedTBBVersions | 6 +++++- 6 files changed, 25 insertions(+), 9 deletions(-)

1 0

[webwml/master] Fix merge conflict in donate-options page
by hiro＠torproject.org 26 Dec '17

26 Dec '17

commit 2921d7c38d0e0b2a82c0cd0c120abf0518235a6c Merge: 5e90acd5 232e4645 Author: hiromipaw <hiro(a)torproject.org> Date: Tue Dec 26 11:18:34 2017 +0100 Fix merge conflict in donate-options page donate/en/.#donate-options.wml | 1 + donate/en/donate-options.wml | 4 ++++ 2 files changed, 5 insertions(+) diff --cc donate/en/.#donate-options.wml index 00000000,00000000..b1e69512 new file mode 120000 --- /dev/null +++ b/donate/en/.#donate-options.wml @@@ -1,0 -1,0 +1,1 @@@ ++hiro@coruscant.6211:1514282996 diff --cc donate/en/donate-options.wml index 42d4a706,53513557..2be04bbc --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@@ -31,7 -31,7 +31,11 @@@ form#makeDonation <div class="hundred toptwenty"> <div class="dbox donate"> <h3>Donate Bitcoin</h3> ++<<<<<<< HEAD +<p>To donate Bitcoin to The Tor Project, please complete the form below. If you would like an acknowledgment from the Tor Project, please provide your email address. (Due to the current state of the Bitcoin market, our payment processor, Bitpay, will not allow us to accept donations of less than 100 USD. However, we can also accept donations, including smaller donations, through Bitcoin Cash. Send us a tip with <a href="https://twitter.com/tipperbot">@tipprbot</a> on Twitter!)</p> ++======= + <p>To donate Bitcoin to The Tor Project, please complete the form below. If you would like an acknowledgment from the Tor Project, please provide your email address. (Due to the current state of the Bitcoin market, our payment processor, Bitpay, will not allow us to accept donations of less than 100 USD. However, we can also accept donations, including smaller donations, through Bitcoin Cash. Send us a tip with <a href="https://twitter.com/tipprbot">@tipprbot</a> on Twitter!)</p> ++>>>>>>> 232e4645232bbcf93f7d7bb95bb04c723852e9f6 <form id="makeDonation" action="https://bitpay.com/checkout" method="post" onsubmit="return bp.validateMobileCheckoutForm($('#makeDonation'));"> <input name="action" type="hidden" value="checkout"> <fieldset class="phone-form well form-horizontal" style="margin-top: 5px;">

1 0

[webwml/master] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml into 24720+1
by hiro＠torproject.org 26 Dec '17

26 Dec '17

commit 79d2298593e9fe95211972a271cc671ad910162e Merge: 048de3fe 232e4645 Author: hiromipaw <hiro(a)torproject.org> Date: Tue Dec 26 11:19:36 2017 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml into 24720+1

1 0

[webwml/master] Fix merge conflict in donate-options page
by hiro＠torproject.org 26 Dec '17

26 Dec '17

commit c0cc2905dfc17791109aaeada45d826858e50c08 Merge: e7c3af0b 79d22985 Author: hiromipaw <hiro(a)torproject.org> Date: Tue Dec 26 11:20:41 2017 +0100 Fix merge conflict in donate-options page Makefile.local.sample | 2 +- donate/en/.#donate-options.wml | 1 - donate/en/donate-options.wml | 4 ---- 3 files changed, 1 insertion(+), 6 deletions(-)

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 25 Dec '17

25 Dec '17

commit 7e06d21dda9d7618db189bf49c9c3c6396181189 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 25 23:50:28 2017 +0000 Update translations for tor-browser-manual --- ro/ro.po | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ro/ro.po b/ro/ro.po index f1d90142c..aa6cb82a3 100644 --- a/ro/ro.po +++ b/ro/ro.po @@ -124,6 +124,10 @@ msgid "" "three keys represent the layers of encryption between the user and each " "relay." msgstr "" +"Imaginea de mai sus arată un utilizator navigând pe diferite site-uri prin " +"Tor. Computerele verzi intermediare reprezintă relee în rețeaua Tor, iar " +"cele trei chei reprezintă nivele de criptare între utilizator și fiecare " +"releu." #: bridges.page:6 msgid "Learn what bridges are and how to get them"

1 0