Browse code

Resolving conflicts on commit

hiro authored on23/08/2018 15:15:01
Showing1 changed files
... ...
@@ -225,18 +225,9 @@
225 225
     HiddenServicePort 22 127.0.0.1:22
226 226
     </pre>
227 227
 
228
-<<<<<<< HEAD
229
-<<<<<<< HEAD
230
-    To set up an onion service on Raspbian have a look at Alec Muffett's
231
-    <a href="https://github.com/alecmuffett/eotk">Enterprise Onion Toolkit</a>.
232
-
233
-=======
234
->>>>>>> 0e7b0b7
235
-=======
236 228
     To set up an onion service on Raspbian have a look at Alec Muffett's
237 229
     <a href="https://github.com/alecmuffett/eotk">Enterprise Onion Toolkit</a>.
238 230
 
239
->>>>>>> c47b250
240 231
     <p>Onion services operators need to practice proper
241 232
     <a href="https://trac.torproject.org/projects/tor/wiki/doc/OperationalSecurity">
242 233
     operational security</a> and system administration to maintain security.
... ...
@@ -288,7 +279,7 @@
288 279
 ​    <p>Since Tor 0.3.2 and
289 280
 >>>>>>> 0e7b0b7
290 281
     <a href="https://blog.torproject.org/tor-browser-75a5-released">Tor Browser
291
-    7.5.a5</a> 56 bit long v3 onion addresses are supported and should be used
282
+    7.5.a5</a> 56-character long v3 onion addresses are supported and should be used
292 283
     instead. This newer version of onion services ("v3") features many
293 284
     improvements over the legacy system:
294 285
     </p>
... ...
@@ -304,10 +295,14 @@
304 295
     <a href="https://trac.torproject.org/projects/tor/wiki/doc/HiddenServiceNames">
305 296
     Why are v3 onions better?</a>. You can identify a next-generation onion
306 297
     address by its length: they are 56 characters long, as in
298
+<<<<<<< HEAD
307 299
     <var>4acth47i6kxnvkewtm6q7ib2s3ufpo5sqbsnzjpbi7utijcltosqemad.onion</a>.
308 300
 <<<<<<< HEAD
309 301
 
310 302
 =======
303
+=======
304
+    <var>4acth47i6kxnvkewtm6q7ib2s3ufpo5sqbsnzjpbi7utijcltosqemad.onion</var>.
305
+>>>>>>> 760bf9a
311 306
     
312 307
 >>>>>>> 0e7b0b7
313 308
     The specification for next gen onion services can be found
... ...
@@ -317,12 +312,18 @@
317 312
 
318 313
     <h3>How to setup your own prop224 service</h3>
319 314
 
315
+<<<<<<< HEAD
320 316
 <<<<<<< HEAD
321 317
     <p>It's easy! Just use your <a href"#two">regular onion service</a> torrc
322 318
 =======
323 319
     <p>It's easy! Just use your ​<a href"#two">regular onion service</a> torrc
324 320
 >>>>>>> 0e7b0b7
325 321
     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
326 327
     Here is an example torrc designed for testing:
327 328
     </p>
328 329
     <pre>
... ...
@@ -346,9 +347,9 @@ HiddenServicePort 6668 127.0.0.1:6667
346 347
 
347 348
     <p>Please note that tor is strict about directory permissions and does not
348 349
     like to share its files. Make sure to restrict read and write access to the
349
-    onion services directory before restarting tor. For most linux based systems you can use:
350
+    onion services directory before restarting tor. For most linux based systems
351
+    <pre>chmod 700 -R /var/lib/tor</pre> should be intended.
350 352
     </p>
351
-    <pre>chmod 700 -R /var/lib/tor</pre>
352 353
 
353 354
     <p>To restart tor it's safer to not use SIGHUP directly (see bug
354 355
     <a href="https://trac.torproject.org/projects/tor/ticket/21818">#21818</a>),