Fix merge conflict
hiro commited on 2018-08-10 19:09:14
Zeige 1 geänderte Dateien mit 31 Einfügungen und 0 Löschungen.
- press/en/press.wml 95c588976..6a259c12c
| ... | ... |
@@@ -50,7 -50,37 +50,38 @@@ some of the significant Tor-related sto |
| 50 | 50 |
</tr> |
| 51 | 51 |
</thead> |
| 52 | 52 |
|
| 53 |
+ <tr style="background-color: #e5e5e5;"> |
|
| 54 |
+ <td>2018 July 02</td> |
|
| 55 |
+ <td>Mada Masr</td> |
|
| 56 |
+ <td><a |
|
| 57 |
+ href="https://www.madamasr.com/en/2018/07/02/news/u/report-internet-censorship-has-become-more-pervasive-in-past-year-62-of-blocked-websites-are-media-outlets/">Report: |
|
| 58 |
+ Internet censorship has become a "more pervasiveâ" in past year</a></td> |
|
| 59 |
+ </tr> |
|
| 60 |
+ |
|
| 53 | 61 |
<tr style=""> |
| 62 |
+ <td>2018 June 28</td> |
|
| 63 |
+ <td>CNET</td> |
|
| 64 |
+ <td><a href="https://www.cnet.com/news/brave-advances-browser-privacy-with-tor-powered-tabs/">Brave |
|
| 65 |
+ advances browser privacy with Tor-powered tabs</a></td> |
|
| 66 |
+ </tr> |
|
| 67 |
+ |
|
| 68 |
+ <tr style="background-color: #e5e5e5;"> |
|
| 69 |
+ <td>2018 June 27</td> |
|
| 70 |
+ <td>ZDNet</td> |
|
| 71 |
+ <td><a href="https://www.zdnet.com/article/venezuela-ramps-up-censorship-with-tor-ban/">Venezuela ramps |
|
| 72 |
+ up censorship</a></td> |
|
| 73 |
+ </tr> |
|
| 74 |
+ |
|
| 75 |
+ <tr style=""> |
|
| 76 |
+ <td>2018 June 26</td> |
|
| 77 |
+ <td>VICE</td> |
|
| 78 |
+ <td><a |
|
| 79 |
+ href="https://news.vice.com/en_us/article/59qvwz/venezuela-maduro-tor-network-censorship">Venezuela just |
|
| 80 |
+ took a huge step towards controlling all access to the Internet</a></td> |
|
| 81 |
+ </tr> |
|
| 82 |
+ |
|
| 83 |
+ <tr style="background-color: #e5e5e5;"> |
|
| 84 |
++>>>>>>> ea87dd7c810e074e6f5c3bd659ff9f58d45da108 |
|
| 54 | 85 |
<td>2018 May 30</td> |
| 55 | 86 |
<td>ZDNet</td> |
| 56 | 87 |
<td><a href="https://www.zdnet.com/article/technology-that-changed-us-the-2000s/">Technology that changed us: The 2000s, from iPhone to Twitter</a></td> |
| 57 | 88 |