[tor-commits] [webwml/staging] Resolving conflicts on commit

[hiro at torproject.org]

commit f377e49a1716cd1d328f381a123673f610f003cf
Merge: 3aebc622 760bf9a1
Author: hiro <hiro at torproject.org>
Date:   Thu Aug 23 15:15:01 2018 +0200

    Resolving conflicts on commit

 docs/en/tor-onion-service.wml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --cc docs/en/tor-onion-service.wml
index 86edc28f,4061678d..2ff4c8d1
--- a/docs/en/tor-onion-service.wml
+++ b/docs/en/tor-onion-service.wml
@@@ -282,13 -273,9 +273,13 @@@
      <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
+     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
      improvements over the legacy system:
      </p>
@@@ -304,12 -291,8 +295,16 @@@
      <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>.
@@@ -317,12 -300,9 +312,18 @@@
  
      <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:
      </p>
      <pre>