[tor-commits] [tor/master] Move free to end of test function so coverity won't complain.

commit cd1f708a7f44ab305c9fcda0060f55f075b98362 Author: Nick Mathewson Date: Thu Dec 21 10:39:29 2017 -0500 Move free to end of test function so coverity won't complain. --- src/test/test_circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor/master] Merge branch 'bug24666_squashed_025' into maint-0.2.5

commit 920208776052d2130557359a0a8077406c60dd21 Merge: 428f8a375 cd1f708a7 Author: Nick Mathewson Date: Thu Dec 21 10:40:10 2017 -0500 Merge branch 'bug24666_squashed_025' into maint-0.2.5 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

commit 7d845976e3897fac8e78a4a26688ac57b660151b Merge: 877dd1d6c 920208776 Author: Nick Mathewson Date: Thu Dec 21 10:43:06 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/master] Use monotime_coarse_absolute_msec() in destroy queue

commit 79a50afa0e3dd44fc5ef80806ccda501fab5a718 Author: Nick Mathewson Date: Thu Dec 21 10:48:37 2017 -0500 Use monotime_coarse_absolute_msec() in destroy queue This way it will match the insert queue in 029 and later. --- src/or/relay.c | 5 + 1 file

[tor-commits] [tor/maint-0.3.1] Use monotime_coarse_absolute_msec() in destroy queue

commit 79a50afa0e3dd44fc5ef80806ccda501fab5a718 Author: Nick Mathewson Date: Thu Dec 21 10:48:37 2017 -0500 Use monotime_coarse_absolute_msec() in destroy queue This way it will match the insert queue in 029 and later. --- src/or/relay.c | 5 + 1 file

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

commit 08469a338ab524e233f357d46504338fd64dedf9 Merge: 5e9264671 03b4dd92a Author: Nick Mathewson Date: Thu Dec 21 10:50:06 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/maint-0.3.2] Move free to end of test function so coverity won't complain.

commit cd1f708a7f44ab305c9fcda0060f55f075b98362 Author: Nick Mathewson Date: Thu Dec 21 10:39:29 2017 -0500 Move free to end of test function so coverity won't complain. --- src/test/test_circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

commit 920208776052d2130557359a0a8077406c60dd21 Merge: 428f8a375 cd1f708a7 Author: Nick Mathewson Date: Thu Dec 21 10:40:10 2017 -0500 Merge branch 'bug24666_squashed_025' into maint-0.2.5 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

commit 3b08184338fd9b0b3e3bd3e5260684cd078beae0 Merge: c604a76a5 7d845976e Author: Nick Mathewson Date: Thu Dec 21 10:43:12 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/maint-0.3.2] Move destroy cells into a separate queue type of their own, to save RAM

commit 520cf21793e9c6b662c76c02235315f898d10fb9 Author: Nick Mathewson Date: Tue Dec 19 13:53:52 2017 -0500 Move destroy cells into a separate queue type of their own, to save RAM We've been seeing problems with destroy cells queues taking up a huge

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

commit 84adb9fcca3d4e1954c1dd215a3e765c689d82b3 Merge: c38157be9 08469a338 Author: Nick Mathewson Date: Thu Dec 21 10:50:33 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

commit 08469a338ab524e233f357d46504338fd64dedf9 Merge: 5e9264671 03b4dd92a Author: Nick Mathewson Date: Thu Dec 21 10:50:06 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

commit 7d845976e3897fac8e78a4a26688ac57b660151b Merge: 877dd1d6c 920208776 Author: Nick Mathewson Date: Thu Dec 21 10:43:06 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

commit 7d845976e3897fac8e78a4a26688ac57b660151b Merge: 877dd1d6c 920208776 Author: Nick Mathewson Date: Thu Dec 21 10:43:06 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/maint-0.3.2] Use monotime_coarse_absolute_msec() in destroy queue

commit 79a50afa0e3dd44fc5ef80806ccda501fab5a718 Author: Nick Mathewson Date: Thu Dec 21 10:48:37 2017 -0500 Use monotime_coarse_absolute_msec() in destroy queue This way it will match the insert queue in 029 and later. --- src/or/relay.c | 5 + 1 file

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

commit 03b4dd92a4c359fb2f699c579ed6dbcd73981267 Merge: 08ed0d793 79a50afa0 Author: Nick Mathewson Date: Thu Dec 21 10:49:40 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

commit 3b08184338fd9b0b3e3bd3e5260684cd078beae0 Merge: c604a76a5 7d845976e Author: Nick Mathewson Date: Thu Dec 21 10:43:12 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/maint-0.3.0] Use monotime_coarse_absolute_msec() in destroy queue

commit 79a50afa0e3dd44fc5ef80806ccda501fab5a718 Author: Nick Mathewson Date: Thu Dec 21 10:48:37 2017 -0500 Use monotime_coarse_absolute_msec() in destroy queue This way it will match the insert queue in 029 and later. --- src/or/relay.c | 5 + 1 file

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

commit 08469a338ab524e233f357d46504338fd64dedf9 Merge: 5e9264671 03b4dd92a Author: Nick Mathewson Date: Thu Dec 21 10:50:06 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

commit 920208776052d2130557359a0a8077406c60dd21 Merge: 428f8a375 cd1f708a7 Author: Nick Mathewson Date: Thu Dec 21 10:40:10 2017 -0500 Merge branch 'bug24666_squashed_025' into maint-0.2.5 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/maint-0.3.1] Move free to end of test function so coverity won't complain.

commit cd1f708a7f44ab305c9fcda0060f55f075b98362 Author: Nick Mathewson Date: Thu Dec 21 10:39:29 2017 -0500 Move free to end of test function so coverity won't complain. --- src/test/test_circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

commit 03b4dd92a4c359fb2f699c579ed6dbcd73981267 Merge: 08ed0d793 79a50afa0 Author: Nick Mathewson Date: Thu Dec 21 10:49:40 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

commit 3b08184338fd9b0b3e3bd3e5260684cd078beae0 Merge: c604a76a5 7d845976e Author: Nick Mathewson Date: Thu Dec 21 10:43:12 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/maint-0.3.1] Move destroy cells into a separate queue type of their own, to save RAM

commit 520cf21793e9c6b662c76c02235315f898d10fb9 Author: Nick Mathewson Date: Tue Dec 19 13:53:52 2017 -0500 Move destroy cells into a separate queue type of their own, to save RAM We've been seeing problems with destroy cells queues taking up a huge

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

commit 920208776052d2130557359a0a8077406c60dd21 Merge: 428f8a375 cd1f708a7 Author: Nick Mathewson Date: Thu Dec 21 10:40:10 2017 -0500 Merge branch 'bug24666_squashed_025' into maint-0.2.5 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

commit 3b08184338fd9b0b3e3bd3e5260684cd078beae0 Merge: c604a76a5 7d845976e Author: Nick Mathewson Date: Thu Dec 21 10:43:12 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

commit 920208776052d2130557359a0a8077406c60dd21 Merge: 428f8a375 cd1f708a7 Author: Nick Mathewson Date: Thu Dec 21 10:40:10 2017 -0500 Merge branch 'bug24666_squashed_025' into maint-0.2.5 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/maint-0.2.9] Move destroy cells into a separate queue type of their own, to save RAM

commit 520cf21793e9c6b662c76c02235315f898d10fb9 Author: Nick Mathewson Date: Tue Dec 19 13:53:52 2017 -0500 Move destroy cells into a separate queue type of their own, to save RAM We've been seeing problems with destroy cells queues taking up a huge

[tor-commits] [tor/maint-0.2.9] Move free to end of test function so coverity won't complain.

commit cd1f708a7f44ab305c9fcda0060f55f075b98362 Author: Nick Mathewson Date: Thu Dec 21 10:39:29 2017 -0500 Move free to end of test function so coverity won't complain. --- src/test/test_circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor/maint-0.2.8] Merge branch 'bug24666_squashed_025' into maint-0.2.5

commit 920208776052d2130557359a0a8077406c60dd21 Merge: 428f8a375 cd1f708a7 Author: Nick Mathewson Date: Thu Dec 21 10:40:10 2017 -0500 Merge branch 'bug24666_squashed_025' into maint-0.2.5 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

commit 7d845976e3897fac8e78a4a26688ac57b660151b Merge: 877dd1d6c 920208776 Author: Nick Mathewson Date: Thu Dec 21 10:43:06 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/maint-0.3.0] Move destroy cells into a separate queue type of their own, to save RAM

commit 520cf21793e9c6b662c76c02235315f898d10fb9 Author: Nick Mathewson Date: Tue Dec 19 13:53:52 2017 -0500 Move destroy cells into a separate queue type of their own, to save RAM We've been seeing problems with destroy cells queues taking up a huge

[tor-commits] [tor/maint-0.2.8] Move free to end of test function so coverity won't complain.

commit cd1f708a7f44ab305c9fcda0060f55f075b98362 Author: Nick Mathewson Date: Thu Dec 21 10:39:29 2017 -0500 Move free to end of test function so coverity won't complain. --- src/test/test_circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

commit 7d845976e3897fac8e78a4a26688ac57b660151b Merge: 877dd1d6c 920208776 Author: Nick Mathewson Date: Thu Dec 21 10:43:06 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/maint-0.3.0] Move free to end of test function so coverity won't complain.

commit cd1f708a7f44ab305c9fcda0060f55f075b98362 Author: Nick Mathewson Date: Thu Dec 21 10:39:29 2017 -0500 Move free to end of test function so coverity won't complain. --- src/test/test_circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor/maint-0.2.9] Use monotime_coarse_absolute_msec() in destroy queue

commit 79a50afa0e3dd44fc5ef80806ccda501fab5a718 Author: Nick Mathewson Date: Thu Dec 21 10:48:37 2017 -0500 Use monotime_coarse_absolute_msec() in destroy queue This way it will match the insert queue in 029 and later. --- src/or/relay.c | 5 + 1 file

[tor-commits] [tor/maint-0.2.8] Move destroy cells into a separate queue type of their own, to save RAM

commit 520cf21793e9c6b662c76c02235315f898d10fb9 Author: Nick Mathewson Date: Tue Dec 19 13:53:52 2017 -0500 Move destroy cells into a separate queue type of their own, to save RAM We've been seeing problems with destroy cells queues taking up a huge

[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.8

commit 7d845976e3897fac8e78a4a26688ac57b660151b Merge: 877dd1d6c 920208776 Author: Nick Mathewson Date: Thu Dec 21 10:43:06 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/maint-0.2.5] Merge branch 'bug24666_squashed_025' into maint-0.2.5

commit 920208776052d2130557359a0a8077406c60dd21 Merge: 428f8a375 cd1f708a7 Author: Nick Mathewson Date: Thu Dec 21 10:40:10 2017 -0500 Merge branch 'bug24666_squashed_025' into maint-0.2.5 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/maint-0.2.5] Move destroy cells into a separate queue type of their own, to save RAM

commit 520cf21793e9c6b662c76c02235315f898d10fb9 Author: Nick Mathewson Date: Tue Dec 19 13:53:52 2017 -0500 Move destroy cells into a separate queue type of their own, to save RAM We've been seeing problems with destroy cells queues taking up a huge

[tor-commits] [tor/maint-0.2.5] Move free to end of test function so coverity won't complain.

commit cd1f708a7f44ab305c9fcda0060f55f075b98362 Author: Nick Mathewson Date: Thu Dec 21 10:39:29 2017 -0500 Move free to end of test function so coverity won't complain. --- src/test/test_circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [webwml/master] Remove redirects add video from extra

commit ddf31327ae780238f48c90fe25900fdeeb3e1fc3 Author: hiromipaw Date: Thu Dec 21 16:55:22 2017 +0100 Remove redirects add video from extra --- .htaccess | 1 - en/averyonionthankyou.wml | 6 +- 2 files changed, 5 insertions(+), 2 deletions(-)

[tor-commits] [tor/release-0.3.2] sched: Consider extra_space even if negative in KIST

commit 885ba513ff709eb86a71c7daf7c23aafab4862a8 Author: David Goulet Date: Tue Dec 19 16:20:36 2017 -0500 sched: Consider extra_space even if negative in KIST With extra_space negative, it means that the "notsent" queue is quite large so we must

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

commit 2a7cad957263f5faed3a0b9de8b15d9794a5541c Merge: c2b64ad09 885ba513f Author: Nick Mathewson Date: Thu Dec 21 10:20:35 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24665| 6 ++ src/or/scheduler_kist.c | 22

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

commit bcc96c77de52ae7a8e73a6b139756e17f25e148d Merge: d0c5fe257 c38157be9 Author: Nick Mathewson Date: Thu Dec 21 10:27:39 2017 -0500 Merge branch 'maint-0.3.2' src/or/scheduler_kist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

[tor-commits] [tor/maint-0.3.2] clarify a comment

commit c38157be9d8fc7de9c6fc0c58e3bc8481a1d48a4 Author: Nick Mathewson Date: Thu Dec 21 10:27:37 2017 -0500 clarify a comment --- src/or/scheduler_kist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/scheduler_kist.c

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

commit 88642bbdc783d8616ba779dbd33378e2c4e09501 Merge: 2a7cad957 c38157be9 Author: Nick Mathewson Date: Thu Dec 21 10:27:39 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/or/scheduler_kist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

[tor-commits] [tor/release-0.3.2] clarify a comment

commit c38157be9d8fc7de9c6fc0c58e3bc8481a1d48a4 Author: Nick Mathewson Date: Thu Dec 21 10:27:37 2017 -0500 clarify a comment --- src/or/scheduler_kist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/scheduler_kist.c

[tor-commits] [tor/master] sched: Consider extra_space even if negative in KIST

commit 885ba513ff709eb86a71c7daf7c23aafab4862a8 Author: David Goulet Date: Tue Dec 19 16:20:36 2017 -0500 sched: Consider extra_space even if negative in KIST With extra_space negative, it means that the "notsent" queue is quite large so we must

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

commit d0c5fe257be0b127681c31ac85853d747465fd09 Merge: 5db94adac 885ba513f Author: Nick Mathewson Date: Thu Dec 21 10:20:35 2017 -0500 Merge branch 'maint-0.3.2' changes/bug24665| 6 ++ src/or/scheduler_kist.c | 22 +++--- 2 files

[tor-commits] [tor/maint-0.3.2] sched: Consider extra_space even if negative in KIST

commit 885ba513ff709eb86a71c7daf7c23aafab4862a8 Author: David Goulet Date: Tue Dec 19 16:20:36 2017 -0500 sched: Consider extra_space even if negative in KIST With extra_space negative, it means that the "notsent" queue is quite large so we must

[tor-commits] [tor/master] clarify a comment

commit c38157be9d8fc7de9c6fc0c58e3bc8481a1d48a4 Author: Nick Mathewson Date: Thu Dec 21 10:27:37 2017 -0500 clarify a comment --- src/or/scheduler_kist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/scheduler_kist.c

[tor-commits] [webwml/master] Fix redirect

commit 121caf0dede7bb5327af4e3198bc732459c5bd2f Author: hiromipaw Date: Thu Dec 21 13:44:44 2017 +0100 Fix redirect --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 21386d6f..cbc5372b 100644 --- a/.htaccess

[tor-commits] [webwml/master] Add redirect for youtube embed

commit 8bb696171d1e61fe1bc8396315fefa85b6a5051a Author: hiromipaw Date: Thu Dec 21 13:31:02 2017 +0100 Add redirect for youtube embed --- .htaccess | 2 ++ en/averyonionthankyou.wml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git

[tor-commits] [webwml/master] Fix previous redirect

commit 8ca3afd216ea3a1e9f48c33cd78aeb1577ab6a04 Author: hiromipaw Date: Thu Dec 21 13:55:35 2017 +0100 Fix previous redirect --- .htaccess | 1 - 1 file changed, 1 deletion(-) diff --git a/.htaccess b/.htaccess index cbc5372b..0c7514f9 100644 --- a/.htaccess +++

[tor-commits] [webwml/master] Change redirect url

commit 942706db0e63b714df6c71a8f7dc9f88acc92daf Author: hiromipaw Date: Thu Dec 21 16:09:28 2017 +0100 Change redirect url --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 0c7514f9..0dca3aa5 100644 ---

[tor-commits] [webwml/staging] Change redirect url

commit 942706db0e63b714df6c71a8f7dc9f88acc92daf Author: hiromipaw Date: Thu Dec 21 16:09:28 2017 +0100 Change redirect url --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 0c7514f9..0dca3aa5 100644 ---

[tor-commits] [tor/master] Fix a pair of memory leaks in tor_cleanup()

commit 5db94adac24a3418d6dcef0078cea330d76ae442 Author: Nick Mathewson Date: Thu Dec 21 08:50:41 2017 -0500 Fix a pair of memory leaks in tor_cleanup() Spotted by coverity scan as 1426749 and 1426750 Bug not in any released Tor. --- src/or/main.c |

[tor-commits] [webwml/staging] Fix previous redirect

commit 8ca3afd216ea3a1e9f48c33cd78aeb1577ab6a04 Author: hiromipaw Date: Thu Dec 21 13:55:35 2017 +0100 Fix previous redirect --- .htaccess | 1 - 1 file changed, 1 deletion(-) diff --git a/.htaccess b/.htaccess index cbc5372b..0c7514f9 100644 --- a/.htaccess +++

[tor-commits] [webwml/staging] Fix redirect

commit 121caf0dede7bb5327af4e3198bc732459c5bd2f Author: hiromipaw Date: Thu Dec 21 13:44:44 2017 +0100 Fix redirect --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 21386d6f..cbc5372b 100644 --- a/.htaccess

[tor-commits] [webwml/staging] Add onion thanks page w onion eating fest

commit cb473f604a760280a587f498bc8069d3d05ce9d2 Author: hiromipaw Date: Thu Dec 21 13:10:35 2017 +0100 Add onion thanks page w onion eating fest --- en/averyonionthankyou.wml | 7 +++ 1 file changed, 7 insertions(+) diff --git a/en/averyonionthankyou.wml

[tor-commits] [webwml/staging] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

commit 753c7af4b1d892c8b6397a47daac4e4968298dc0 Merge: 4771d7fe 86a86d75 Author: hiromipaw Date: Wed Dec 20 11:47:04 2017 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml include/versions.wmi | 4 ++--

[tor-commits] [webwml/staging] Add redirect for youtube embed

commit 8bb696171d1e61fe1bc8396315fefa85b6a5051a Author: hiromipaw Date: Thu Dec 21 13:31:02 2017 +0100 Add redirect for youtube embed --- .htaccess | 2 ++ en/averyonionthankyou.wml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git

[tor-commits] [webwml/staging] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml into faq-section-anchors

commit 8e385ca3d5e8809a91fb4f225d7375c7180480d6 Merge: f98b7fd5 34c7baf2 Author: hiromipaw Date: Thu Dec 14 19:59:13 2017 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml into faq-section-anchors .gitignore

[tor-commits] [webwml/staging] Add new Tor Browser version: 7.5a10

commit 86a86d757a0fa56cc1117f489c870861e0e0 Author: Nicolas Vigier Date: Wed Dec 20 11:22:02 2017 +0100 Add new Tor Browser version: 7.5a10 --- include/versions.wmi | 4 ++-- projects/torbrowser/RecommendedTBBVersions | 6 +- 2 files

[tor-commits] [webwml/staging] Fix thankyou redirect

commit 4771d7febbf328adc64382fb7b5e00edcaef1f53 Author: hiromipaw Date: Wed Dec 20 11:46:50 2017 +0100 Fix thankyou redirect --- .htaccess | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index f6442986..86a523e0 100644 ---

[tor-commits] [webwml/staging] Merge remote-tracking branch 'kat/tor-users-dead-links'

commit bc2c344347a0d69af008941580a7c4c0c5f787ff Merge: 9f5f29d3 8d7dd7b6 Author: hiromipaw Date: Mon Dec 4 18:16:51 2017 +0100 Merge remote-tracking branch 'kat/tor-users-dead-links' about/en/torusers.wml | 20 +--- 1 file changed, 9 insertions(+), 11

[tor-commits] [webwml/staging] Move version-win32-stable closer to version-torbrowserbundle-all

commit e23dad8b56ce5f6b8574967ff505f52596703512 Author: Nicolas Vigier Date: Sat Dec 9 16:22:36 2017 +0100 Move version-win32-stable closer to version-torbrowserbundle-all --- include/versions.wmi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [webwml/staging] Fix for ticket #22609 from pastly

commit 7217519424d1febfa0e919f3ccdbe95bbd3c7fb1 Merge: cafc6b4a bc2c3443 Author: hiromipaw Date: Mon Dec 4 18:21:07 2017 +0100 Fix for ticket #22609 from pastly .gitignore |2 +- .htaccess

[tor-commits] [webwml/staging] Move version-torbrowsersandboxlinux closer to version-torbrowserbundlebeta-all

commit 13a3006ca2f24c207088573224ba8ab188ae7b97 Author: Nicolas Vigier Date: Sat Dec 9 16:23:02 2017 +0100 Move version-torbrowsersandboxlinux closer to version-torbrowserbundlebeta-all --- include/versions.wmi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

[tor-commits] [webwml/staging] Make section headings within the question list linkable. (#24519)

commit f98b7fd58310518d4712510abc5a1d788ef96c31 Author: kat Date: Mon Dec 4 15:29:58 2017 -0500 Make section headings within the question list linkable. (#24519) Add anchors. Change heading text from paragraphs to h4s, but keep previous vertcal spacing.

[tor-commits] [webwml/staging] Add new Tor Browser version: 7.5a9

commit e4638cf4742afe6ae00626bee0e366c3d8323529 Author: Nicolas Vigier Date: Sat Dec 9 17:04:05 2017 +0100 Add new Tor Browser version: 7.5a9 --- include/versions.wmi | 6 +++--- projects/torbrowser/RecommendedTBBVersions | 6 +- 2 files

[tor-commits] [webwml/staging] Deprecate old Tor Browser versions

commit 53990269cabe7f7e7481dca7d1622fa8778bff8c Author: Georg Koppen Date: Mon Dec 11 13:20:49 2017 + Deprecate old Tor Browser versions --- projects/torbrowser/RecommendedTBBVersions | 8 1 file changed, 8 deletions(-) diff --git

[tor-commits] [webwml/staging] Add new Tor Browser version: 7.0.11

commit e50fb2e5974b97fa03f0f2094c7b179fb4d592a3 Author: Nicolas Vigier Date: Sat Dec 9 16:19:17 2017 +0100 Add new Tor Browser version: 7.0.11 --- include/versions.wmi | 6 +++--- projects/torbrowser/RecommendedTBBVersions | 4 2 files

[tor-commits] [webwml/staging] Reword Sukhbir's people page entry

commit 34c7baf25e9de5ddaf45721b72186a1614f59faf Author: Damian Johnson Date: Wed Dec 13 11:34:23 2017 -0800 Reword Sukhbir's people page entry Tweaking the wording per his request. --- about/en/corepeople.wml | 2 +- 1 file changed, 1 insertion(+), 1

[tor-commits] [webwml/staging] 0.3.2.7-rc is released

commit 4513f113b6f71ac7b75c7f8b952f6ad22111d630 Author: Nick Mathewson Date: Thu Dec 14 14:00:54 2017 -0500 0.3.2.7-rc is released --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile

[tor-commits] [webwml/staging] Adjust css top nav

commit 7f27d07261d0be534e25f174e5643c50c80cd9ed Author: hiromipaw Date: Tue Dec 5 18:23:47 2017 +0100 Adjust css top nav --- css/layout.css | 3 ++- css/layout.min.css | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/css/layout.css

[tor-commits] [webwml/staging] Add Amogh to people page

commit 1c59f59b42cdc194ba4428e59159a6de461a138f Author: Damian Johnson Date: Sun Dec 10 14:53:55 2017 -0800 Add Amogh to people page --- about/en/corepeople.wml| 157 - images/people/amoghbl1.png | Bin 0 -> 11879 bytes

[tor-commits] [webwml/staging] Fix dead links and update content. (#22522)

commit 8d7dd7b65ec798139cf2cbb25ca10b4106b880f3 Author: kat Date: Sat Dec 2 14:50:57 2017 -0500 Fix dead links and update content. (#22522) Make dead news report links point to wayback machine versions. Make dead adopton link point to Wikipedia.

[tor-commits] [webwml/staging] Fix #24233

commit 656a7a382335ee537a2fa1fd6980509f7414f09d Author: hiromipaw Date: Mon Dec 4 19:49:09 2017 +0100 Fix #24233 --- include/donatehead.wmi | 4 +--- include/links.wmi | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/donatehead.wmi

[tor-commits] [webwml/staging] Add sections for trac (#18586) and reporting bad relays (#22412).

commit 9f5f29d3b01135ff66317af76046208a902a2cd3 Author: kat Date: Sun Dec 3 14:59:18 2017 -0500 Add sections for trac (#18586) and reporting bad relays (#22412). Add sections. Move security section to directly follow trac section. --- about/en/contact.wml

[tor-commits] [webwml/staging] Merge master

commit e4d0feaa4e5675c60394594decb8afb6cdecff4c Merge: 0ef0389e 656a7a38 Author: hiromipaw Date: Tue Dec 5 18:10:06 2017 +0100 Merge master Makefile| 4 +- about/en/board.wml | 6 +- about/en/contact.wml

[tor-commits] [webwml/staging] Add Jennifer to people page

commit f3c2aef3106a3e5a01590317a58bb0ae45247f43 Author: Damian Johnson Date: Wed Nov 22 11:37:46 2017 -0800 Add Jennifer to people page --- about/en/corepeople.wml | 106 +++- images/people/orig/redshiftzero.jpg | Bin 0 -> 51523 bytes

[tor-commits] [webwml/staging] Add giving assistant to donate options

commit 53906d0652d0b440fd746c8fa1ba4929cc204d2d Author: hiromipaw Date: Mon Nov 27 20:39:45 2017 +0100 Add giving assistant to donate options --- donate/en/donate-options.wml | 16 1 file changed, 16 insertions(+) diff --git

[tor-commits] [webwml/staging] Separate css for people table

commit b2f85d72c31c2095161e64e8b193e3152f6ba6e7 Author: Damian Johnson Date: Mon Nov 20 02:00:42 2017 -0800 Separate css for people table We embedded this because we seemed to require committed minification to do styling (which is incorrect, minification

[tor-commits] [webwml/staging] Add hrefs to the heading anchors in the answers. (#24519)

commit f87eea1a1a9f45bb15db61e6c970765d0784f235 Author: kat Date: Mon Dec 11 14:12:42 2017 -0500 Add hrefs to the heading anchors in the answers. (#24519) --- docs/en/faq.wml | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git

[tor-commits] [webwml/staging] alpha is now 0.3.2.5-alpha

commit 0e11d0896a82fe95b569b6d025690b898d156581 Author: Nick Mathewson Date: Wed Nov 22 08:20:03 2017 -0500 alpha is now 0.3.2.5-alpha --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git

[tor-commits] [webwml/staging] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml into faq-hrefs-for-anchors

commit 99f445f943b9abec3677b5af9931c629657a55a8 Merge: f87eea1a 53990269 Author: hiromipaw Date: Wed Dec 13 16:16:38 2017 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml into faq-hrefs-for-anchors .gitignore

[tor-commits] [webwml/staging] Bug 24589: Redirect Amazon Payment users to https://donate.torproject.org/thank-you

commit db6c5b9cda18e50af2b2aebc338053991e55bc15 Author: Arthur Edelstein Date: Tue Dec 19 13:53:10 2017 -0500 Bug 24589: Redirect Amazon Payment users to https://donate.torproject.org/thank-you --- .htaccess | 7 --- 1 file changed, 4 insertions(+), 3

[tor-commits] [webwml/staging] Edit .gitignore not to trak generated htmls

commit 5faee30fdd5c212ec4868f80b0c3537471443875 Author: hiromipaw Date: Wed Nov 22 12:49:40 2017 +0100 Edit .gitignore not to trak generated htmls --- .gitignore | 2 +- download/download-easy.html.es | 434 -

[tor-commits] [webwml/staging] Modify Ramy bio in board page

commit 762d1abeac216786036bd152eae7f948b3d3f8b9 Author: hiromipaw Date: Wed Nov 22 18:24:26 2017 +0100 Modify Ramy bio in board page --- about/en/board.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/board.wml b/about/en/board.wml

[tor-commits] [webwml/staging] Remove deadlink in who uses Tor

commit 0f20850a4eb86369f93bf4069f022455d25f6b09 Author: hiromipaw Date: Wed Nov 22 18:21:25 2017 +0100 Remove deadlink in who uses Tor --- about/en/torusers.wml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/about/en/torusers.wml

[tor-commits] [webwml/staging] Be consistent about key/twitter ordering

commit 3f17add465ded388311bbfe215a8425baac34fb3 Author: Damian Johnson Date: Wed Nov 22 11:39:12 2017 -0800 Be consistent about key/twitter ordering For Arturo's entry we inverted the order compared with all the others. --- about/en/corepeople.wml | 2 +- 1

[tor-commits] [webwml/staging] Switching colors on board page

commit 9daefa6930974b197cede79cdf1e07a73978b02a Author: hiromipaw Date: Wed Nov 22 18:18:01 2017 +0100 Switching colors on board page --- about/en/board.wml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/about/en/board.wml b/about/en/board.wml

[tor-commits] [webwml/staging] Remove broken link on donate options page

commit 1731e62da0de1e28fef357b56aa868cc53733a83 Author: hiromipaw Date: Mon Nov 27 20:40:59 2017 +0100 Remove broken link on donate options page --- donate/en/donate-options.wml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git

[tor-commits] [webwml/staging] New releases

commit 3a73aeabec6b069264143784d35a5f944b33023a Author: Nick Mathewson Date: Fri Dec 1 08:55:33 2017 -0500 New releases --- Makefile | 4 ++-- include/versions.wmi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile

[tor-commits] [webwml/staging] Text for giving assistant should be p

commit a990fa78973bdde09c95a7266ec959e1811c73f3 Author: hiromipaw Date: Tue Nov 28 11:11:19 2017 +0100 Text for giving assistant should be p --- donate/en/donate-options.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [webwml/staging] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

commit c69eb984b93efb9779dd867787098b67f663852e Merge: 1731e62d 3f17add4 Author: hiromipaw Date: Mon Nov 27 20:41:21 2017 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml about/en/contributors.wml | 3 -

[tor-commits] [webwml/staging] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

commit 472321a51e20d0388e8f0ed48f5ac443684efe94 Merge: 0f20850a 0e11d089 Author: hiromipaw Date: Wed Nov 22 18:22:50 2017 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml Makefile | 2 +- include/versions.wmi | 2 +- 2 files

[tor-commits] [webwml/staging] Add redirect for donate button

commit 9e1dda3a1dab3b0abc871960b39efeff6b7f206c Author: hiromipaw Date: Wed Nov 22 12:42:05 2017 +0100 Add redirect for donate button --- donate/en/donate-button.wml| 7 + download/download-easy.html.es | 434 +

<    1   2   3   >