commit 670eef6fab66fe091d3c49354b65d15e16ecc3d1
Merge: be786f13 c51c7f2c
Author: hiro <[email protected]>
Date: Mon Aug 27 13:02:19 2018 +0200
Fix merge conflicts with master
docs/debian-selector.js | 5 +
download/en/download-easy.wml | 111 +------------------
download/en/download-unix.wml | 18 +++-
download/en/download.wml | 173 +++++-------------------------
download/en/tor.wml | 241 ++++++++++++++++++++++++++++++++++++++++++
en/index.wml | 2 +-
images/distros/slackware.png | Bin 0 -> 19882 bytes
include/versions.wmi | 13 ++-
include/warning.wmi | 132 +++++++++++++++++++++++
projects/en/projects.wml | 9 +-
10 files changed, 440 insertions(+), 264 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
