user/colin/curriculum, branch master

user/colin/curriculum, branch master Colin's curriculum repository Adding onion logo to worksheets 2015-06-29T03:07:05+00:00 Colin Childs colin@torproject.org 2015-06-29T03:07:05+00:00 7e7412cb8e4df39657247ee336664d4b0f64cce9

Add questions to module3 worksheet 2015-06-28T23:35:22+00:00 Colin Childs colin@torproject.org 2015-06-28T23:35:22+00:00 f4a2a1e4d3383e44c18ffb5030a7aa3230700051

Add TODO file 2015-06-28T23:30:01+00:00 Colin Childs colin@torproject.org 2015-06-28T23:30:01+00:00 cbc057be816efeab46b447d17d75c7a54f5495b5

Merge branch 'master' of ssh://TorGit/user/colin/curriculum 2015-06-28T22:47:59+00:00 Colin Childs colin@torproject.org 2015-06-28T22:47:59+00:00 6a05b0e6153147dde5d93b6949e33f3e863545af Conflicts: module4/module4.tex

Conflicts:
	module4/module4.tex

Merge branch 'torbrowser_visual_update' 2015-06-28T22:45:13+00:00 Colin Childs colin@torproject.org 2015-06-28T22:45:13+00:00 9f04f2612104c942b63b40b1139986b6351a0890

Drop tails module 2015-06-28T22:45:03+00:00 Colin Childs colin@torproject.org 2015-06-28T22:45:03+00:00 d44ebb9521781c79accaec63400fc0d13936b5e1

Add worksheets and fix naming issue 2015-06-28T22:39:07+00:00 Colin Childs colin@torproject.org 2015-06-28T22:39:07+00:00 f39fd8468754f9be20388593846b2acecdf7d9e9

Changing titles and fixing module naming 2015-06-24T04:27:08+00:00 Colin Childs colin@torproject.org 2015-06-24T04:27:08+00:00 30b6af00d9612a1be1d7544a58923b0f5d0c5f68

Dropping module3 2015-06-24T04:24:16+00:00 Colin Childs colin@torproject.org 2015-06-24T04:24:16+00:00 70cf623348068c0b9a397727489e59b2aac1bb9e

module2 update push, and image rename 2015-06-24T03:42:22+00:00 Colin Childs colin@torproject.org 2015-06-24T03:42:22+00:00 ff996e2a54654fb55b11f0946f1b49cd1338dac1