commit 676da0eacc768faa2ea7a59ec0eb1e2c4fd6f054 Merge: e2ccb890 0e7b0b7b Author: hiro hiro@torproject.org Date: Thu Aug 23 15:11:10 2018 +0200
Resolving conflicts on commit
docs/en/tor-onion-service.wml | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
diff --cc docs/en/tor-onion-service.wml index e17270c4,7ef903e1..3494cc69 --- a/docs/en/tor-onion-service.wml +++ b/docs/en/tor-onion-service.wml @@@ -225,9 -213,6 +225,12 @@@ HiddenServicePort 22 127.0.0.1:22 </pre>
++<<<<<<< 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 <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. @@@ -273,7 -258,7 +276,11 @@@ <h2><a class="anchor" href="#four">Step Four: Set up next-gen (v3) onions</a></h2> <br>
++<<<<<<< HEAD + <p>Since Tor 0.3.2 and ++======= + <p>Since Tor 0.3.2 and ++>>>>>>> 0e7b0b7 <a href="https://blog.torproject.org/tor-browser-75a5-released">Tor Browser 7.5.a5</a> 56 bit long v3 onion addresses are supported and should be used instead. This newer version of onion services ("v3") features many @@@ -292,7 -277,7 +299,11 @@@ Why are v3 onions better?</a>. You can identify a next-generation onion address by its length: they are 56 characters long, as in <var>4acth47i6kxnvkewtm6q7ib2s3ufpo5sqbsnzjpbi7utijcltosqemad.onion</a>. ++<<<<<<< HEAD + ++======= + ++>>>>>>> 0e7b0b7 The specification for next gen onion services can be found <a href="https://gitweb.torproject.org/torspec.git/tree/rend-spec-v3.txt"> here</a>. @@@ -300,7 -285,7 +311,11 @@@
<h3>How to setup your own prop224 service</h3>
++<<<<<<< HEAD + <p>It's easy! Just use your <a href"#two">regular onion service</a> torrc ++======= + <p>It's easy! Just use your <a href"#two">regular onion service</a> torrc ++>>>>>>> 0e7b0b7 and add <var>HiddenServiceVersion 3</var> in your onion service torrc block. Here is an example torrc designed for testing: </p>