commit 9f04f2612104c942b63b40b1139986b6351a0890 Merge: d44ebb9 f39fd84 Author: Colin Childs <colin@torproject.org> Date: Sun Jun 28 17:45:13 2015 -0500 Merge branch 'torbrowser_visual_update' Makefile | 10 +-- module1/module1.tex | 4 +- module1/module1_ws.tex | 36 +++++++++++ module2/module2.tex | 70 ++++++++++++++++++--- module2/module2_ws.tex | 36 +++++++++++ module3/module3.tex | 94 ++++++++++++++--------------- module3/module3_ws.tex | 28 +++++++++ onion.jpg | Bin 3911 -> 0 bytes pictures/onion.jpg | Bin 0 -> 3911 bytes shots/generic/browser.png | Bin 0 -> 80489 bytes shots/generic/privacy_slider.png | Bin 0 -> 26834 bytes shots/linux/verify.png | Bin 0 -> 62940 bytes shots/torbutton/torbutton_menu.png | Bin 0 -> 125787 bytes shots/torlauncher/torlauncher.png | Bin 0 -> 17807 bytes shots/torlauncher/torlauncher_bridges.png | Bin 0 -> 29850 bytes shots/torlauncher/torlauncher_ports.png | Bin 0 -> 20324 bytes shots/torlauncher/torlauncher_proxy.png | Bin 0 -> 24601 bytes 17 files changed, 214 insertions(+), 64 deletions(-)