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

[boklm]

commit b0fac878027b3973b74efe4c1df50b8f0089e753
Merge: eaf380a9 dd6d2ed1
Author: Nicolas Vigier 
Date:   Tue Jun 26 15:14:16 2018 +0200

Merge branch 'staging'

 include/versions.wmi   |  1 -
 projects/en/torbrowser.wml | 25 -
 2 files changed, 26 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[hiro]

commit 55f70bc39a9ae3012ce3c826fb3ccf847697acd5
Merge: 2a7cddc8 56d63982
Author: hiromipaw 
Date:   Thu Nov 16 18:39:49 2017 +0100

Merge branch 'staging' of ssh://git-rw.torproject.org/project/web/webwml 
into staging

 download/en/download-easy.wml  |   4 +-
 download/en/download.wml   |  18 +---
 include/versions.wmi   |  56 ++
 projects/en/torbrowser.wml | 166 +
 projects/torbrowser/RecommendedTBBVersions |  15 +--
 5 files changed, 166 insertions(+), 93 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[hiro]

commit 17f293417c8143abefebcef91921287e0c787778
Merge: 512790e7 92819ff8
Author: hiromipaw 
Date:   Wed Nov 15 17:27:49 2017 +0100

Merge branch 'staging' of ssh://git-rw.torproject.org/project/web/webwml 
into staging

 Makefile.common   |   2 +-
 download/download.html.es | 476 ++
 download/es/download.wml  | 376 
 3 files changed, 853 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[weasel]

commit 75a21b72db5519bf572a5e4a1a7a8a3e05866aea
Merge: 371a8cf d4e1a35
Author: Peter Palfrader 
Date:   Sun Mar 19 18:37:14 2017 +0100

Merge branch 'staging'

* staging:
  Do not use onchange=, instead add listeners in init
  Move Debian sources.list generator JS into its own file (re: #21769)

 docs/debian-selector.js | 163 +
 docs/en/debian.wml  | 174 ++--
 include/head.wmi|   1 +
 3 files changed, 170 insertions(+), 168 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[sebastian]

commit a913f039edaa066fa30b05b50246ff5d945e73ce
Merge: c147121 6bfcba9
Author: Sebastian Hahn sebast...@torproject.org
Date:   Wed Feb 11 18:32:04 2015 +0100

Merge branch 'staging'

 docs/en/debian.wml |  238 ++--
 1 file changed, 231 insertions(+), 7 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[sebastian]

commit dc63fc86127010eb3a1c687b0a8f3322bd067116
Merge: 63b2d91 2e30e55
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sun Feb 8 04:28:56 2015 +0100

Merge branch 'staging'

 docs/en/verifying-signatures.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[sebastian]

commit dc9009b3741cf9f262359739e087f5eb89f23432
Merge: ab0918c 1700644
Author: Sebastian Hahn sebast...@torproject.org
Date:   Thu Dec 11 14:01:11 2014 +0100

Merge branch 'staging'

 about/en/corepeople.wml  |2 +-
 about/en/jobs-coredev.wml|2 +-
 about/en/jobs-pluggabletransport.wml |2 +-
 docs/en/faq.wml  |   10 +-
 docs/en/pluggable-transports.wml |   10 +-
 docs/en/tor-doc-relay.wml|2 +-
 docs/torbutton/en/index.wml  |6 +++---
 eff/en/tor-legal-faq.wml |2 +-
 getinvolved/en/volunteer.wml |2 +-
 projects/en/obfsproxy.wml|2 +-
 projects/en/torbrowser.wml   |4 ++--
 projects/en/tordnsel.wml |2 +-
 projects/en/vidalia.wml  |2 +-
 13 files changed, 24 insertions(+), 24 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[arma]

commit cc71355d6b3cf82259de52aae296256d6947f257
Merge: 6e50a26 086abcf
Author: Roger Dingledine a...@torproject.org
Date:   Wed Dec 10 13:07:31 2014 -0500

Merge branch 'staging'

 about/en/jobs-projectcoordinator.wml |  118 +
 about/en/jobs-projectmanager.wml |  120 ++
 2 files changed, 122 insertions(+), 116 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

[sebastian]

commit 1e4e965c1012934f5da78f47077fcc17db83c661
Merge: 995f9e3 aa38962
Author: Sebastian Hahn sebast...@torproject.org
Date:   Thu Nov 13 19:18:15 2014 +0100

Merge branch 'staging'

Conflicts:
projects/en/torbrowser.wml

 .gitignore  |   19 +
 docs/en/tor-doc-relay.wml   |   55 --
 docs/en/tor-doc-windows.wml |   90 +++
 include/blog-recent.wmi |9 +
 include/head.wmi|   59 +++-
 projects/en/torbrowser.wml  |   33 
 6 files changed, 75 insertions(+), 190 deletions(-)

diff --cc projects/en/torbrowser.wml
index 1910761,ddd492b..9aef167
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@@ -508,9 -508,9 +508,10 @@@
  /table
/div
/div
+ --
  /div
/div
- --
++
div id=macosx class=anchor/div
div class=macosx box
  div class=pjtitleh2Mac OS X Instructions/h2/div

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits