[tor-commits] [webwml/staging] Merge remote-tracking branch 'asn/web_hs_page_riseup_guide'

[arma at torproject.org]

commit 25d4b9ceafb2478e36990841a78d87a1c6a07b6b
Merge: 53ecc1c 65ecaeb
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Sun Feb 7 03:00:03 2016 +0100

    Merge remote-tracking branch 'asn/web_hs_page_riseup_guide'

 docs/en/tor-hidden-service.wml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)