[TWN team] Recent changes to the wiki pages

[Lunar]

Lunar:
> version 12
> Author: mttp
> Date:   2014-06-30T22:46:56+00:00
> 
>    --
> 
> --- version 11
> +++ version 12
> @@ -70,7 +70,16 @@
>  Tor help desk roundup
>  ---------------------
>  
> -Summary of some questions sent to the Tor help desk. 
> +The help desk has been asked about the “ethics” behind Tor. Tor’s technical
> +design decisions are laid out in the various design documents [XXX], but
> +to understand the social and cultural motivations for the Tor Project,
> +videos like Roger’s talk at Internet Days [XXX], or Jake and Roger’s talks 
> +at the Chaos Communications Congress in 2011 [XXX] and 2013 [XXX] are good
> +resources.
> +
> +[XXX]: https://media.torproject.org/video/tor-internet-days-2010.mp4
> +[XXX]: https://media.torproject.org/video/28c3-4800-en-how_governments_have_tried_to_block_tor_h264.mp4
> +[XXX]: https://media.torproject.org/video/30C3_-_5423_-_en_-_saal_1_-_201312272030_-_the_tor_network_-_jacob_-_arma_concat_.mp4

Thanks for getting this back in. :)

-- 
Lunar                                             <lunar at torproject.org>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.torproject.org/pipermail/news-team/attachments/20140701/bbf3836c/attachment.sig>