resolved conflict in zh merge
resolved merge issues
Merge branch 'master' of https://github.com/riseupnet/riseup_help
Merge pull request #95 from dtto/master

A few additional comments and some housekeeping changes
fix we.riseup.net hidden service
keeping your software patched is critical
prefer stronger ciphers
Merge pull request #96 from dkg/master

keeping your software patched is critical
Merge remote-tracking branch 'upstream/master'