torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'saper/default_nickname'

Browse Source
This commit is contained in:
Nick Mathewson
2018-05-07 13:31:03 -04:00
parent a1a32b4834 0c7740b7de
commit 2c5841a8b8
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config/torrc.minimal.in-staging
+1 -1
View File
@@ -100,7 +100,7 @@
## A handle for your relay, so people don't have to refer to it by key.
## Nicknames must be between 1 and 19 characters inclusive, and must
## contain only the alphanumeric characters (a-z, A-Z, 0-9). No unicode,
## no emoji.
## no emoji. If not set, "Unnamed" will be used.
#Nickname ididnteditheconfig
## Define these to limit how much relayed traffic you will allow. Your
src/config/torrc.sample.in
+1
View File
@@ -106,6 +106,7 @@
## A handle for your relay, so people don't have to refer to it by key.
## Nicknames must be between 1 and 19 characters inclusive, and must
## contain only the characters [a-zA-Z0-9].
## If not set, "Unnamed" will be used.
#Nickname ididnteditheconfig
## Define these to limit how much relayed traffic you will allow. Your