commit b8db3ac06bbec2c22b3bd0be79fc090e269988e6 Merge: a69383c4 67999ec7 Author: hiromipaw hiro@torproject.org Date: Mon Jan 22 21:50:09 2018 +0100

Merge branch 'master' of git-rw.torproject.org:project/web/webwml into add-tor-security-list-info-to-contact

docs/en/debian.wml | 2 +- docs/en/openbsd.wml | 39 +++++++++++++++++++++++++++++++++++++++ docs/en/sidenav.wmi | 3 +++ docs/en/tor-doc-unix.wml | 6 +++--- donate/en/donate-options.wml | 4 ++-- getinvolved/en/tshirt.wml | 2 +- press/en/press.wml | 12 ++++++++++++ 7 files changed, 61 insertions(+), 7 deletions(-)