Browse code

Fix merging conflicts

hiro authored on23/08/2018 16:47:20
Showing1 changed files
... ...
@@ -273,11 +273,7 @@
273 273
     <h2><a class="anchor" href="#four">Step Four: Set up next-gen (v3) onions</a></h2>
274 274
     <br>
275 275
 
276
-<<<<<<< HEAD
277 276
     <p>Since Tor 0.3.2 and
278
-=======
279
-​    <p>Since Tor 0.3.2 and
280
->>>>>>> 0e7b0b7
281 277
     <a href="https://blog.torproject.org/tor-browser-75a5-released">Tor Browser
282 278
     7.5.a5</a> 56-character long v3 onion addresses are supported and should be used
283 279
     instead. This newer version of onion services ("v3") features many
... ...
@@ -295,36 +291,18 @@
295 291
     <a href="https://trac.torproject.org/projects/tor/wiki/doc/HiddenServiceNames">
296 292
     Why are v3 onions better?</a>. You can identify a next-generation onion
297 293
     address by its length: they are 56 characters long, as in
298
-<<<<<<< HEAD
299 294
     <var>4acth47i6kxnvkewtm6q7ib2s3ufpo5sqbsnzjpbi7utijcltosqemad.onion</a>.
300
-<<<<<<< HEAD
301
-
302
-=======
303
-=======
304
-    <var>4acth47i6kxnvkewtm6q7ib2s3ufpo5sqbsnzjpbi7utijcltosqemad.onion</var>.
305
->>>>>>> 760bf9a
306
-    
307
->>>>>>> 0e7b0b7
295
+
308 296
     The specification for next gen onion services can be found
309 297
     <a href="https://gitweb.torproject.org/torspec.git/tree/rend-spec-v3.txt">
310 298
     here</a>.
311 299
     </p>
312 300
 
313 301
     <h3>How to setup your own prop224 service</h3>
314
-
315
-<<<<<<< HEAD
316
-<<<<<<< HEAD
317
-    <p>It's easy! Just use your <a href"#two">regular onion service</a> torrc
318
-=======
319 302
     <p>It's easy! Just use your ​<a href"#two">regular onion service</a> torrc
320
->>>>>>> 0e7b0b7
321 303
     and add <var>HiddenServiceVersion 3</var> in your onion service torrc block.
322
-=======
323
-    <p>It's easy! Just use your <a href"#two">regular onion service</a>
324
-    <a href="<page docs/faq>#torrc">torrc</a> and add
325
-    <var>HiddenServiceVersion 3</var> in your onion service torrc block.
326
->>>>>>> 760bf9a
327
-    Here is an example torrc designed for testing:
304
+
305
+`   Here is an example torrc designed for testing:
328 306
     </p>
329 307
     <pre>
330 308
 SocksPort auto