commit 2b193d6eaa11815906c3c71ba9d47e089af87063 Author: hiro hiro@torproject.org Date: Thu Aug 23 16:47:20 2018 +0200

Fix merging conflicts --- docs/en/tor-onion-service.wml | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/docs/en/tor-onion-service.wml b/docs/en/tor-onion-service.wml index 2ff4c8d1..2bd13ad8 100644 --- a/docs/en/tor-onion-service.wml +++ b/docs/en/tor-onion-service.wml @@ -273,11 +273,7 @@ <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-character long v3 onion addresses are supported and should be used instead. This newer version of onion services ("v3") features many @@ -295,36 +291,18 @@ <a href="https://trac.torproject.org/projects/tor/wiki/doc/HiddenServiceNames"> Why are v3 onions better?</a>. You can identify a next-generation onion address by its length: they are 56 characters long, as in -<<<<<<< HEAD <var>4acth47i6kxnvkewtm6q7ib2s3ufpo5sqbsnzjpbi7utijcltosqemad.onion</a>. -<<<<<<< HEAD - -======= -======= - <var>4acth47i6kxnvkewtm6q7ib2s3ufpo5sqbsnzjpbi7utijcltosqemad.onion</var>. ->>>>>>> 760bf9a - ->>>>>>> 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>. </p>

<h3>How to setup your own prop224 service</h3> - -<<<<<<< HEAD -<<<<<<< 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. -======= - <p>It's easy! Just use your <a href"#two">regular onion service</a> - <a href="<page docs/faq>#torrc">torrc</a> and add - <var>HiddenServiceVersion 3</var> in your onion service torrc block. ->>>>>>> 760bf9a - Here is an example torrc designed for testing: + +` Here is an example torrc designed for testing: </p> <pre> SocksPort auto