commit b3bb2ee9ee91364e3888ad69e7f2fc0ecde50856 Merge: 6aba458 4362cf1 Author: Colin Childs colin@torproject.org Date: Wed Jan 18 00:27:33 2017 -0600

Merge remote-tracking branch 'arthur/20959+4'

C/bridges.page | 2 +- C/media/circumvention/bridges.png | Bin 65025 -> 107953 bytes C/media/tor-launcher-custom-bridges.png | Bin 0 -> 110652 bytes C/media/tor-launcher-custom-bridges_en-US.png | Bin 38194 -> 0 bytes C/media/updating/update3.png | Bin 224277 -> 50445 bytes C/media/updating/update4.png | Bin 183302 -> 34917 bytes ar/media/circumvention/bridges.png | Bin 0 -> 87651 bytes ar/media/circumvention/configure.png | Bin 0 -> 55442 bytes ar/media/first-time/connect.png | Bin 0 -> 55641 bytes ar/media/first-time/proxy.png | Bin 0 -> 65506 bytes ar/media/first-time/proxy_question.png | Bin 0 -> 77916 bytes ar/media/managing-identities/circuit_full.png | Bin 0 -> 71546 bytes ar/media/managing-identities/new_identity.png | Bin 0 -> 43137 bytes ar/media/onionsites/onion_url.png | Bin 0 -> 70432 bytes ar/media/plugins/noscript_menu.png | Bin 0 -> 22958 bytes ar/media/secure-connections/https.png | Bin 0 -> 151715 bytes ar/media/security-slider/slider.png | Bin 0 -> 42113 bytes ar/media/security-slider/slider_window.png | Bin 0 -> 39148 bytes ar/media/tor-launcher-custom-bridges.png | Bin 0 -> 104960 bytes ar/media/updating/update1.png | Bin 0 -> 32964 bytes ar/media/updating/update3.png | Bin 0 -> 42791 bytes ar/media/updating/update4.png | Bin 0 -> 31979 bytes de/media/circumvention/bridges.png | Bin 0 -> 116636 bytes de/media/circumvention/configure.png | Bin 0 -> 82220 bytes de/media/first-time/connect.png | Bin 0 -> 82373 bytes de/media/first-time/proxy.png | Bin 0 -> 77601 bytes de/media/first-time/proxy_question.png | Bin 0 -> 106754 bytes de/media/managing-identities/circuit_full.png | Bin 0 -> 95090 bytes de/media/managing-identities/new_identity.png | Bin 0 -> 59149 bytes de/media/onionsites/onion_url.png | Bin 0 -> 71279 bytes de/media/plugins/noscript_menu.png | Bin 0 -> 33294 bytes de/media/secure-connections/https.png | Bin 0 -> 191903 bytes de/media/security-slider/slider.png | Bin 0 -> 47873 bytes de/media/security-slider/slider_window.png | Bin 0 -> 42836 bytes de/media/tor-launcher-custom-bridges.png | Bin 0 -> 123121 bytes de/media/updating/update1.png | Bin 0 -> 48948 bytes de/media/updating/update3.png | Bin 0 -> 54398 bytes de/media/updating/update4.png | Bin 0 -> 37313 bytes fa/media/circumvention/bridges.png | Bin 0 -> 100677 bytes fa/media/circumvention/configure.png | Bin 0 -> 62997 bytes fa/media/first-time/connect.png | Bin 0 -> 63108 bytes fa/media/first-time/proxy.png | Bin 0 -> 68896 bytes fa/media/first-time/proxy_question.png | Bin 0 -> 84800 bytes fa/media/managing-identities/circuit_full.png | Bin 0 -> 69459 bytes fa/media/managing-identities/new_identity.png | Bin 0 -> 39515 bytes fa/media/onionsites/onion_url.png | Bin 0 -> 71098 bytes fa/media/plugins/noscript_menu.png | Bin 0 -> 25940 bytes fa/media/secure-connections/https.png | Bin 0 -> 151503 bytes fa/media/security-slider/slider.png | Bin 0 -> 40604 bytes fa/media/security-slider/slider_window.png | Bin 0 -> 37627 bytes fa/media/tor-launcher-custom-bridges.png | Bin 0 -> 106725 bytes fa/media/updating/update1.png | Bin 0 -> 31015 bytes fa/media/updating/update3.png | Bin 0 -> 45555 bytes fa/media/updating/update4.png | Bin 0 -> 33681 bytes it/media/circumvention/bridges.png | Bin 0 -> 109757 bytes it/media/circumvention/configure.png | Bin 0 -> 75392 bytes it/media/first-time/connect.png | Bin 0 -> 75549 bytes it/media/first-time/proxy.png | Bin 0 -> 77596 bytes it/media/first-time/proxy_question.png | Bin 0 -> 94920 bytes it/media/managing-identities/circuit_full.png | Bin 0 -> 92893 bytes it/media/managing-identities/new_identity.png | Bin 0 -> 55713 bytes it/media/onionsites/onion_url.png | Bin 0 -> 71287 bytes it/media/plugins/noscript_menu.png | Bin 0 -> 36478 bytes it/media/secure-connections/https.png | Bin 0 -> 181526 bytes it/media/security-slider/slider.png | Bin 0 -> 49343 bytes it/media/security-slider/slider_window.png | Bin 0 -> 43066 bytes it/media/tor-launcher-custom-bridges.png | Bin 0 -> 111975 bytes it/media/updating/update1.png | Bin 0 -> 50783 bytes it/media/updating/update3.png | Bin 0 -> 54638 bytes it/media/updating/update4.png | Bin 0 -> 36336 bytes ja/media/circumvention/bridges.png | Bin 0 -> 132691 bytes ja/media/circumvention/configure.png | Bin 0 -> 96222 bytes ja/media/first-time/connect.png | Bin 0 -> 96360 bytes ja/media/first-time/proxy.png | Bin 0 -> 78894 bytes ja/media/first-time/proxy_question.png | Bin 0 -> 115367 bytes ja/media/managing-identities/circuit_full.png | Bin 0 -> 91189 bytes ja/media/managing-identities/new_identity.png | Bin 0 -> 60717 bytes ja/media/onionsites/onion_url.png | Bin 0 -> 71513 bytes ja/media/plugins/noscript_menu.png | Bin 0 -> 36823 bytes ja/media/secure-connections/https.png | Bin 0 -> 191545 bytes ja/media/security-slider/slider.png | Bin 0 -> 52108 bytes ja/media/security-slider/slider_window.png | Bin 0 -> 44727 bytes ja/media/tor-launcher-custom-bridges.png | Bin 0 -> 137431 bytes ja/media/updating/update1.png | Bin 0 -> 50795 bytes ja/media/updating/update3.png | Bin 0 -> 60050 bytes ja/media/updating/update4.png | Bin 0 -> 37030 bytes ko/media/circumvention/bridges.png | Bin 0 -> 111695 bytes ko/media/circumvention/configure.png | Bin 0 -> 77027 bytes ko/media/first-time/connect.png | Bin 0 -> 77234 bytes ko/media/first-time/proxy.png | Bin 0 -> 72810 bytes ko/media/first-time/proxy_question.png | Bin 0 -> 92347 bytes ko/media/managing-identities/circuit_full.png | Bin 0 -> 87599 bytes ko/media/managing-identities/new_identity.png | Bin 0 -> 51866 bytes ko/media/onionsites/onion_url.png | Bin 0 -> 71109 bytes ko/media/plugins/noscript_menu.png | Bin 0 -> 31531 bytes ko/media/secure-connections/https.png | Bin 0 -> 190389 bytes ko/media/security-slider/slider.png | Bin 0 -> 41614 bytes ko/media/security-slider/slider_window.png | Bin 0 -> 40312 bytes ko/media/tor-launcher-custom-bridges.png | Bin 0 -> 117157 bytes ko/media/updating/update1.png | Bin 0 -> 40116 bytes ko/media/updating/update3.png | Bin 0 -> 53413 bytes ko/media/updating/update4.png | Bin 0 -> 35191 bytes nl/media/circumvention/bridges.png | Bin 0 -> 110664 bytes nl/media/circumvention/configure.png | Bin 0 -> 76285 bytes nl/media/first-time/connect.png | Bin 0 -> 76278 bytes nl/media/first-time/proxy.png | Bin 0 -> 76372 bytes nl/media/first-time/proxy_question.png | Bin 0 -> 95308 bytes nl/media/managing-identities/circuit_full.png | Bin 0 -> 90385 bytes nl/media/managing-identities/new_identity.png | Bin 0 -> 57505 bytes nl/media/onionsites/onion_url.png | Bin 0 -> 71595 bytes nl/media/plugins/noscript_menu.png | Bin 0 -> 34453 bytes nl/media/secure-connections/https.png | Bin 0 -> 154069 bytes nl/media/security-slider/slider.png | Bin 0 -> 52932 bytes nl/media/security-slider/slider_window.png | Bin 0 -> 42570 bytes nl/media/tor-launcher-custom-bridges.png | Bin 0 -> 112118 bytes nl/media/updating/update1.png | Bin 0 -> 50965 bytes nl/media/updating/update3.png | Bin 0 -> 52023 bytes nl/media/updating/update4.png | Bin 0 -> 35765 bytes pl/media/circumvention/bridges.png | Bin 0 -> 112608 bytes pl/media/circumvention/configure.png | Bin 0 -> 79630 bytes pl/media/first-time/connect.png | Bin 0 -> 79594 bytes pl/media/first-time/proxy.png | Bin 0 -> 78118 bytes pl/media/first-time/proxy_question.png | Bin 0 -> 104634 bytes pl/media/managing-identities/circuit_full.png | Bin 0 -> 98123 bytes pl/media/managing-identities/new_identity.png | Bin 0 -> 63627 bytes pl/media/onionsites/onion_url.png | Bin 0 -> 71412 bytes pl/media/plugins/noscript_menu.png | Bin 0 -> 39311 bytes pl/media/secure-connections/https.png | Bin 0 -> 203818 bytes pl/media/security-slider/slider.png | Bin 0 -> 52153 bytes pl/media/security-slider/slider_window.png | Bin 0 -> 47084 bytes pl/media/tor-launcher-custom-bridges.png | Bin 0 -> 115288 bytes pl/media/updating/update1.png | Bin 0 -> 50770 bytes pl/media/updating/update3.png | Bin 0 -> 56052 bytes pl/media/updating/update4.png | Bin 0 -> 37193 bytes ru/media/circumvention/bridges.png | Bin 0 -> 93086 bytes ru/media/circumvention/configure.png | Bin 0 -> 80322 bytes ru/media/first-time/connect.png | Bin 0 -> 80355 bytes ru/media/first-time/proxy.png | Bin 0 -> 85576 bytes ru/media/first-time/proxy_question.png | Bin 0 -> 105895 bytes ru/media/managing-identities/circuit_full.png | Bin 0 -> 122547 bytes ru/media/managing-identities/new_identity.png | Bin 0 -> 73948 bytes ru/media/onionsites/onion_url.png | Bin 0 -> 71192 bytes ru/media/plugins/noscript_menu.png | Bin 0 -> 43364 bytes ru/media/secure-connections/https.png | Bin 0 -> 213005 bytes ru/media/security-slider/slider.png | Bin 0 -> 44716 bytes ru/media/security-slider/slider_window.png | Bin 0 -> 45616 bytes ru/media/tor-launcher-custom-bridges.png | Bin 0 -> 121256 bytes ru/media/updating/update1.png | Bin 0 -> 42439 bytes ru/media/updating/update3.png | Bin 0 -> 56493 bytes ru/media/updating/update4.png | Bin 0 -> 38428 bytes tr/media/circumvention/bridges.png | Bin 0 -> 103018 bytes tr/media/circumvention/configure.png | Bin 0 -> 71372 bytes tr/media/first-time/connect.png | Bin 0 -> 71360 bytes tr/media/first-time/proxy.png | Bin 0 -> 76940 bytes tr/media/first-time/proxy_question.png | Bin 0 -> 93466 bytes tr/media/managing-identities/circuit_full.png | Bin 0 -> 89611 bytes tr/media/managing-identities/new_identity.png | Bin 0 -> 54900 bytes tr/media/onionsites/onion_url.png | Bin 0 -> 71210 bytes tr/media/plugins/noscript_menu.png | Bin 0 -> 41420 bytes tr/media/secure-connections/https.png | Bin 0 -> 199580 bytes tr/media/security-slider/slider.png | Bin 0 -> 43963 bytes tr/media/security-slider/slider_window.png | Bin 0 -> 41597 bytes tr/media/tor-launcher-custom-bridges.png | Bin 0 -> 106347 bytes tr/media/updating/update1.png | Bin 0 -> 43720 bytes tr/media/updating/update3.png | Bin 0 -> 50624 bytes tr/media/updating/update4.png | Bin 0 -> 33876 bytes vi/media/circumvention/bridges.png | Bin 0 -> 119731 bytes vi/media/circumvention/configure.png | Bin 0 -> 80425 bytes vi/media/first-time/connect.png | Bin 0 -> 80478 bytes vi/media/first-time/proxy.png | Bin 0 -> 77353 bytes vi/media/first-time/proxy_question.png | Bin 0 -> 102660 bytes vi/media/managing-identities/circuit_full.png | Bin 0 -> 93219 bytes vi/media/managing-identities/new_identity.png | Bin 0 -> 58366 bytes vi/media/onionsites/onion_url.png | Bin 0 -> 71396 bytes vi/media/plugins/noscript_menu.png | Bin 0 -> 37098 bytes vi/media/secure-connections/https.png | Bin 0 -> 217200 bytes vi/media/security-slider/slider.png | Bin 0 -> 50888 bytes vi/media/security-slider/slider_window.png | Bin 0 -> 45532 bytes vi/media/tor-launcher-custom-bridges.png | Bin 0 -> 121058 bytes vi/media/updating/update1.png | Bin 0 -> 50712 bytes vi/media/updating/update3.png | Bin 0 -> 54339 bytes vi/media/updating/update4.png | Bin 0 -> 35740 bytes zh-CN/media/circumvention/bridges.png | Bin 0 -> 109534 bytes zh-CN/media/circumvention/configure.png | Bin 0 -> 76448 bytes zh-CN/media/first-time/connect.png | Bin 0 -> 76526 bytes zh-CN/media/first-time/proxy.png | Bin 0 -> 74229 bytes zh-CN/media/first-time/proxy_question.png | Bin 0 -> 101653 bytes zh-CN/media/managing-identities/circuit_full.png | Bin 0 -> 92392 bytes zh-CN/media/managing-identities/new_identity.png | Bin 0 -> 51813 bytes zh-CN/media/onionsites/onion_url.png | Bin 0 -> 71506 bytes zh-CN/media/plugins/noscript_menu.png | Bin 0 -> 27596 bytes zh-CN/media/secure-connections/https.png | Bin 0 -> 242307 bytes zh-CN/media/security-slider/slider.png | Bin 0 -> 46432 bytes zh-CN/media/security-slider/slider_window.png | Bin 0 -> 42115 bytes zh-CN/media/tor-launcher-custom-bridges.png | Bin 0 -> 114544 bytes zh-CN/media/updating/update1.png | Bin 0 -> 43264 bytes zh-CN/media/updating/update3.png | Bin 0 -> 51686 bytes zh-CN/media/updating/update4.png | Bin 0 -> 33287 bytes 198 files changed, 1 insertion(+), 1 deletion(-)