commit 2148922d45ac188c22c95a24e5a2e13f45bdecb9 Merge: 5394beea 7def96eb Author: emma peel emma.peel@riseup.net Date: Tue Jan 15 15:07:24 2019 +0000

Merge remote-tracking branch 'traumschule/bridges' into HEAD

docs/en/bridges.wml | 152 ++++++++++++++------- .../tb-tor-launcher-bootstrap-failed-obfs.png | Bin 0 -> 18988 bytes .../bridges/tb-tor-launcher-bootstrap-failed.png | Bin 0 -> 28650 bytes images/bridges/tb-tor-launcher-bootstrap.png | Bin 0 -> 20534 bytes images/bridges/tb-tor-launcher-bridges-options.png | Bin 0 -> 37996 bytes .../bridges/tb-tor-launcher-bridges-provided.png | Bin 0 -> 29757 bytes images/bridges/tb-tor-launcher-bridges.png | Bin 0 -> 25193 bytes .../bridges/tb-tor-launcher-network-settings.png | Bin 0 -> 14463 bytes images/bridges/tb-tor-launcher-obfs4.png | Bin 0 -> 25469 bytes images/bridges/tb-tor-launcher-provide-bridge.png | Bin 0 -> 27856 bytes images/bridges/tb-tor-launcher-proxy.png | Bin 0 -> 29185 bytes .../tb-tor-launcher-request-bridges-captcha.png | Bin 0 -> 152798 bytes .../tb-tor-launcher-request-bridges-connect.png | Bin 0 -> 38885 bytes .../tb-tor-launcher-request-bridges-success.png | Bin 0 -> 37151 bytes images/bridges/tb-tor-launcher-request-bridges.png | Bin 0 -> 26623 bytes images/bridges/tb-tor-launcher-startup.png | Bin 0 -> 27362 bytes images/tb-bridge-networksettings.png | Bin 86129 -> 0 bytes images/tb-bridges-custom-from-browser.png | Bin 107151 -> 0 bytes images/tb-bridges-options-from-browser.png | Bin 66972 -> 0 bytes images/tb-bridges-provided-from-browser.png | Bin 84736 -> 0 bytes images/tb-frontpage.png | Bin 36890 -> 11075 bytes images/tb-tor-button-menu.png | Bin 58398 -> 21300 bytes images/tb-tor-launcher-bridges-custom.png | Bin 88827 -> 0 bytes images/tb-tor-launcher-bridges-options.png | Bin 83439 -> 0 bytes images/tb-tor-launcher-bridges-provided.png | Bin 75365 -> 0 bytes images/tb-tor-launcher-isp-interference.png | Bin 89171 -> 0 bytes images/tb-tor-launcher-no-proxy.png | Bin 74714 -> 0 bytes images/tb-tor-launcher-startup.png | Bin 89215 -> 0 bytes 28 files changed, 105 insertions(+), 47 deletions(-)