Resolving conflicts on commit
hiro commited on 2018-08-23 15:13:15
Zeige 1 geänderte Dateien mit 6 Einfügungen und 0 Löschungen.
- docs/en/tor-onion-service.wml 4319ad3c7..86edc28f2
| ... | ... |
@@@ -225,12 -225,9 +225,18 @@@ |
| 225 | 225 |
HiddenServicePort 22 127.0.0.1:22 |
| 226 | 226 |
</pre> |
| 227 | 227 |
|
| 228 |
++<<<<<<< HEAD |
|
| 228 | 229 |
+<<<<<<< HEAD |
| 229 | 230 |
To set up an onion service on Raspbian have a look at Alec Muffett's |
| 230 | 231 |
<a href="https://github.com/alecmuffett/eotk">Enterprise Onion Toolkit</a>. |
| 231 | 232 |
|
| 232 | 233 |
+======= |
| 233 | 234 |
+>>>>>>> 0e7b0b7 |
| 235 |
++======= |
|
| 236 |
++ To set up an onion service on Raspbian have a look at Alec Muffett's |
|
| 237 |
++ <a href="https://github.com/alecmuffett/eotk">Enterprise Onion Toolkit</a>. |
|
| 238 |
++ |
|
| 239 |
++>>>>>>> c47b250 |
|
| 234 | 240 |
<p>Onion services operators need to practice proper |
| 235 | 241 |
<a href="https://trac.torproject.org/projects/tor/wiki/doc/OperationalSecurity"> |
| 236 | 242 |
operational security</a> and system administration to maintain security. |
| 237 | 243 |