commit 3aebc62231e3d10a2b3fc1d0c297496f3b98f8db Merge: 7ea301bb c47b250c Author: hiro hiro@torproject.org Date: Thu Aug 23 15:13:15 2018 +0200

Resolving conflicts on commit

docs/en/tor-onion-service.wml | 6 ++++++ 1 file changed, 6 insertions(+)

diff --cc docs/en/tor-onion-service.wml index 3494cc69,4319ad3c..86edc28f --- a/docs/en/tor-onion-service.wml +++ b/docs/en/tor-onion-service.wml @@@ -225,12 -225,9 +225,18 @@@ HiddenServicePort 22 127.0.0.1:22 </pre>

+<<<<<<< HEAD ++<<<<<<< HEAD To set up an onion service on Raspbian have a look at Alec Muffett's <a href="https://github.com/alecmuffett/eotk">Enterprise Onion Toolkit</a>.

+======= +>>>>>>> 0e7b0b7 ++======= ++ To set up an onion service on Raspbian have a look at Alec Muffett's ++ <a href="https://github.com/alecmuffett/eotk">Enterprise Onion Toolkit</a>. ++ ++>>>>>>> c47b250 <p>Onion services operators need to practice proper <a href="https://trac.torproject.org/projects/tor/wiki/doc/OperationalSecurity"> operational security</a> and system administration to maintain security.