mirror of
https://github.com/torproject/webwml.git
synced 2024-12-12 04:25:49 +00:00
Fix merge conflict
This commit is contained in:
commit
c26087d3ee
@ -50,7 +50,38 @@ some of the significant Tor-related stories that have popped up.</p>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tr style="background-color: #e5e5e5;">
|
||||
<td>2018 July 02</td>
|
||||
<td>Mada Masr</td>
|
||||
<td><a
|
||||
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:
|
||||
Internet censorship has become a "more pervasiveâ" in past year</a></td>
|
||||
</tr>
|
||||
|
||||
<tr style="">
|
||||
<td>2018 June 28</td>
|
||||
<td>CNET</td>
|
||||
<td><a href="https://www.cnet.com/news/brave-advances-browser-privacy-with-tor-powered-tabs/">Brave
|
||||
advances browser privacy with Tor-powered tabs</a></td>
|
||||
</tr>
|
||||
|
||||
<tr style="background-color: #e5e5e5;">
|
||||
<td>2018 June 27</td>
|
||||
<td>ZDNet</td>
|
||||
<td><a href="https://www.zdnet.com/article/venezuela-ramps-up-censorship-with-tor-ban/">Venezuela ramps
|
||||
up censorship</a></td>
|
||||
</tr>
|
||||
|
||||
<tr style="">
|
||||
<td>2018 June 26</td>
|
||||
<td>VICE</td>
|
||||
<td><a
|
||||
href="https://news.vice.com/en_us/article/59qvwz/venezuela-maduro-tor-network-censorship">Venezuela just
|
||||
took a huge step towards controlling all access to the Internet</a></td>
|
||||
</tr>
|
||||
|
||||
<tr style="background-color: #e5e5e5;">
|
||||
>>>>>>> ea87dd7c810e074e6f5c3bd659ff9f58d45da108
|
||||
<td>2018 May 30</td>
|
||||
<td>ZDNet</td>
|
||||
<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>
|
||||
|
Loading…
Reference in New Issue
Block a user