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

2014-12-13 Thread sebastian
commit cc71355d6b3cf82259de52aae296256d6947f257 Merge: 6e50a26 086abcf Author: Roger Dingledine Date: Wed Dec 10 13:07:31 2014 -0500 Merge branch 'staging' about/en/jobs-projectcoordinator.wml | 118 + about/en/jobs-projectmanager.wml | 120 ++

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

2014-12-13 Thread sebastian
commit dc9009b3741cf9f262359739e087f5eb89f23432 Merge: ab0918c 1700644 Author: Sebastian Hahn 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 |

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

2015-02-08 Thread sebastian
commit dc63fc86127010eb3a1c687b0a8f3322bd067116 Merge: 63b2d91 2e30e55 Author: Sebastian Hahn 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] [webwml/staging] Merge branch 'staging'

2015-02-12 Thread sebastian
commit a913f039edaa066fa30b05b50246ff5d945e73ce Merge: c147121 6bfcba9 Author: Sebastian Hahn 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] [webwml/staging] Merge branch 'staging'

2014-11-15 Thread sebastian
commit 1e4e965c1012934f5da78f47077fcc17db83c661 Merge: 995f9e3 aa38962 Author: Sebastian Hahn 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