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

2018-08-27 Thread hiro 
commit 676da0eacc768faa2ea7a59ec0eb1e2c4fd6f054
Merge: e2ccb890 0e7b0b7b
Author: hiro 
Date:   Thu Aug 23 15:11:10 2018 +0200

Resolving conflicts on commit

 docs/en/tor-onion-service.wml | 15 +++
 1 file changed, 15 insertions(+)

diff --cc docs/en/tor-onion-service.wml
index e17270c4,7ef903e1..3494cc69
--- a/docs/en/tor-onion-service.wml
+++ b/docs/en/tor-onion-service.wml
@@@ -225,9 -213,6 +225,12 @@@
  HiddenServicePort 22 127.0.0.1:22
  
  
++<<< HEAD
 +To set up an onion service on Raspbian have a look at Alec Muffett's
 +https://github.com/alecmuffett/eotk;>Enterprise Onion 
Toolkit.
 +
++===
++>>> 0e7b0b7
  Onion services operators need to practice proper
  https://trac.torproject.org/projects/tor/wiki/doc/OperationalSecurity;>
  operational security and system administration to maintain security.
@@@ -273,7 -258,7 +276,11 @@@
  Step Four: Set up next-gen (v3) 
onions
  
  
++<<< HEAD
 +Since Tor 0.3.2 and
++===
+ ​Since Tor 0.3.2 and
++>>> 0e7b0b7
  https://blog.torproject.org/tor-browser-75a5-released;>Tor 
Browser
  7.5.a5 56 bit long v3 onion addresses are supported and should be used
  instead. This newer version of onion services ("v3") features many
@@@ -292,7 -277,7 +299,11 @@@
  Why are v3 onions better?. You can identify a next-generation onion
  address by its length: they are 56 characters long, as in
  4acth47i6kxnvkewtm6q7ib2s3ufpo5sqbsnzjpbi7utijcltosqemad.onion.
++<<< HEAD
 +
++===
+ 
++>>> 0e7b0b7
  The specification for next gen onion services can be found
  https://gitweb.torproject.org/torspec.git/tree/rend-spec-v3.txt;>
  here.
@@@ -300,7 -285,7 +311,11 @@@
  
  How to setup your own prop224 service
  
++<<< HEAD
 +It's easy! Just use your regular onion service torrc
++===
+ It's easy! Just use your ​regular onion service 
torrc
++>>> 0e7b0b7
  and add HiddenServiceVersion 3 in your onion service torrc 
block.
  Here is an example torrc designed for testing:
  



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2018-08-27 Thread hiro 
commit f377e49a1716cd1d328f381a123673f610f003cf
Merge: 3aebc622 760bf9a1
Author: hiro 
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 @@@
  Step Four: Set up next-gen (v3) 
onions
  
  
 +<<< HEAD
 +Since Tor 0.3.2 and
 +===
  ​Since Tor 0.3.2 and
 +>>> 0e7b0b7
  https://blog.torproject.org/tor-browser-75a5-released;>Tor 
Browser
- 7.5.a5 56 bit long v3 onion addresses are supported and should be used
+ 7.5.a5 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:
  
@@@ -304,12 -291,8 +295,16 @@@
  https://trac.torproject.org/projects/tor/wiki/doc/HiddenServiceNames;>
  Why are v3 onions better?. You can identify a next-generation onion
  address by its length: they are 56 characters long, as in
++<<< HEAD
 +4acth47i6kxnvkewtm6q7ib2s3ufpo5sqbsnzjpbi7utijcltosqemad.onion.
 +<<< HEAD
 +
 +===
++===
+ 4acth47i6kxnvkewtm6q7ib2s3ufpo5sqbsnzjpbi7utijcltosqemad.onion.
++>>> 760bf9a
  
 +>>> 0e7b0b7
  The specification for next gen onion services can be found
  https://gitweb.torproject.org/torspec.git/tree/rend-spec-v3.txt;>
  here.
@@@ -317,12 -300,9 +312,18 @@@
  
  How to setup your own prop224 service
  
 +<<< HEAD
++<<< HEAD
 +It's easy! Just use your regular onion service torrc
 +===
 +It's easy! Just use your ​regular onion service 
torrc
 +>>> 0e7b0b7
 +and add HiddenServiceVersion 3 in your onion service torrc 
block.
++===
+ It's easy! Just use your regular onion service
+ torrc and add
+ HiddenServiceVersion 3 in your onion service torrc block.
++>>> 760bf9a
  Here is an example torrc designed for testing:
  
  



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2018-08-27 Thread hiro 
commit 3aebc62231e3d10a2b3fc1d0c297496f3b98f8db
Merge: 7ea301bb c47b250c
Author: hiro 
Date:   Thu Aug 23 15:13:15 2018 +0200

Resolving conflicts on commit

 docs/en/tor-onion-service.wml | 6 ++
 1 file changed, 6 insertions(+)

diff --cc docs/en/tor-onion-service.wml
index 3494cc69,4319ad3c..86edc28f
--- a/docs/en/tor-onion-service.wml
+++ b/docs/en/tor-onion-service.wml
@@@ -225,12 -225,9 +225,18 @@@
  HiddenServicePort 22 127.0.0.1:22
  
  
 +<<< HEAD
++<<< HEAD
  To set up an onion service on Raspbian have a look at Alec Muffett's
  https://github.com/alecmuffett/eotk;>Enterprise Onion 
Toolkit.
  
 +===
 +>>> 0e7b0b7
++===
++To set up an onion service on Raspbian have a look at Alec Muffett's
++https://github.com/alecmuffett/eotk;>Enterprise Onion 
Toolkit.
++
++>>> c47b250
  Onion services operators need to practice proper
  https://trac.torproject.org/projects/tor/wiki/doc/OperationalSecurity;>
  operational security and system administration to maintain security.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits