Resolving conflicts on commit
hiro

hiro commited on 2018-08-23 15:11:10
Zeige 1 geänderte Dateien mit 15 Einfügungen und 0 Löschungen.

... ...
@@@ -225,9 -213,6 +225,12 @@@
213 225
      HiddenServicePort 22 127.0.0.1:22
214 226
      </pre>
215 227
  
228
++<<<<<<< HEAD
216 229
 +    To set up an onion service on Raspbian have a look at Alec Muffett's
217 230
 +    <a href="https://github.com/alecmuffett/eotk">Enterprise Onion Toolkit</a>.
218 231
 +
232
++=======
233
++>>>>>>> 0e7b0b7
219 234
      <p>Onion services operators need to practice proper
220 235
      <a href="https://trac.torproject.org/projects/tor/wiki/doc/OperationalSecurity">
221 236
      operational security</a> and system administration to maintain security.
... ...
@@@ -273,7 -258,7 +276,11 @@@
258 276
      <h2><a class="anchor" href="#four">Step Four: Set up next-gen (v3) onions</a></h2>
259 277
      <br>
260 278
  
279
++<<<<<<< HEAD
261 280
 +    <p>Since Tor 0.3.2 and
281
++=======
282
+ ​    <p>Since Tor 0.3.2 and
283
++>>>>>>> 0e7b0b7
262 284
      <a href="https://blog.torproject.org/tor-browser-75a5-released">Tor Browser
263 285
      7.5.a5</a> 56 bit long v3 onion addresses are supported and should be used
264 286
      instead. This newer version of onion services ("v3") features many
... ...
@@@ -292,7 -277,7 +299,11 @@@
277 299
      Why are v3 onions better?</a>. You can identify a next-generation onion
278 300
      address by its length: they are 56 characters long, as in
279 301
      <var>4acth47i6kxnvkewtm6q7ib2s3ufpo5sqbsnzjpbi7utijcltosqemad.onion</a>.
302
++<<<<<<< HEAD
280 303
 +
304
++=======
305
+     
306
++>>>>>>> 0e7b0b7
281 307
      The specification for next gen onion services can be found
282 308
      <a href="https://gitweb.torproject.org/torspec.git/tree/rend-spec-v3.txt">
283 309
      here</a>.
... ...
@@@ -300,7 -285,7 +311,11 @@@
285 311
  
286 312
      <h3>How to setup your own prop224 service</h3>
287 313
  
314
++<<<<<<< HEAD
288 315
 +    <p>It's easy! Just use your <a href"#two">regular onion service</a> torrc
316
++=======
317
+     <p>It's easy! Just use your ​<a href"#two">regular onion service</a> torrc
318
++>>>>>>> 0e7b0b7
289 319
      and add <var>HiddenServiceVersion 3</var> in your onion service torrc block.
290 320
      Here is an example torrc designed for testing:
291 321
      </p>
292 322