Commit 5ec751b3 authored by George Kadianakis's avatar George Kadianakis
Browse files

Merge branch 'tor-github/pr/1324'

parents a1192b6b 11cf4d9c
o Minor features (testing):
- Add a script to invoke "tor --dump-config" and "tor --verify-config"
with various configuration options, and see whether tor's resulting
configuration or error messages are what we expect. Use it for
integration testing of our +Option and /Option flags.
Closes ticket 31637.
nicknames must be between 1 and 19 characters inclusive
# This nickname is too long; we won't accept it.
Nickname TooManyCharactersInThisNickname
must contain only the characters \[a-zA-Z0-9\]
# this nickname has spaces in it and won't work.
Nickname has a space
ContactInfo config option must be UTF-8
ContactInfo tor_tellini@example.com
SocksPort 80
# Here is a simple example torrc.
SocksPort 80
ContactInfo "tor_tellini@example.com"
Unknown option 'JumpingJellyjars'
ContactInfo includefile@example.com
Nickname nested
ORPort 8008
ContactInfo includefile@example.com
%include "nested.inc"
\ No newline at end of file
Nickname nested
\ No newline at end of file
%include "included.inc"
ORPort 8008
AccountingMax 10737418240
AccountingRule sum
AccountingStart day 05:15
Address 128.66.8.8
AllowNonRFC953Hostnames 1
AndroidIdentityTag droidy
AutomapHostsOnResolve 1
AutomapHostsSuffixes .onions
AvoidDiskWrites 1
BandwidthBurst 2147483647
BandwidthRate 1610612736
Bridge 128.66.1.10:80
CacheDirectory /this-is-a-cache
CellStatistics 1
CircuitBuildTimeout 200
CircuitsAvailableTimeout 10
CircuitStreamTimeout 20
ClientAutoIPv6ORPort 1
ClientOnly 1
ClientPreferIPv6DirPort 1
ClientPreferIPv6ORPort 1
ClientRejectInternalAddresses 0
ClientUseIPv4 0
ClientUseIPv6 1
ConnDirectionStatistics 1
ConnectionPadding 1
ConnLimit 64
ConsensusParams wombat=7
ConstrainedSockets 1
ConstrainedSockSize 10240
ContactInfo long_config@example.com
ControlPortFileGroupReadable 1
ControlPort 9058
CookieAuthentication 1
CookieAuthFile /control/cookie
CookieAuthFileGroupReadable 1
CountPrivateBandwidth 1
DataDirectory /data/dir
DirAllowPrivateAddresses 1
DirPolicy reject 128.66.1.1/32, accept *:*
DirPortFrontPage /dirport/frontpage
DirPort 99
DirReqStatistics 0
DisableDebuggerAttachment 0
DisableNetwork 1
DisableOOSCheck 0
DNSPort 53535
DormantCanceledByStartup 1
DormantClientTimeout 1260
DormantOnFirstStartup 1
DormantTimeoutDisabledByIdleStreams 0
DoSCircuitCreationBurst 1000
DoSCircuitCreationDefenseTimePeriod 300
DoSCircuitCreationDefenseType 2
DoSCircuitCreationEnabled 1
DoSCircuitCreationMinConnections 10
DoSCircuitCreationRate 100
DoSConnectionDefenseType 2
DoSConnectionEnabled 1
DoSConnectionMaxConcurrentCount 6
DoSRefuseSingleHopClientRendezvous 0
DownloadExtraInfo 1
EnforceDistinctSubnets 0
EntryNodes potrzebie,triffid,cromulent
EntryStatistics 1
ExcludeExitNodes blaznort,kriffid,zeppelin
ExcludeNodes 128.66.7.6
ExitNodes 128.66.7.7,128.66.128.0/17,exitexit
ExitPolicy accept *:80,reject *:*
ExitPolicyRejectLocalInterfaces 1
ExitPolicyRejectPrivate 0
ExitPortStatistics 1
ExitRelay 1
ExtendAllowPrivateAddresses 1
ExtendByEd25519ID 1
ExtORPortCookieAuthFile /foobar
ExtORPort 99
FascistFirewall 1
FetchDirInfoEarly 1
FetchDirInfoExtraEarly 1
FetchUselessDescriptors 1
FirewallPorts 80,443,999
GeoIPExcludeUnknown 1
GeoIPFile /geoip
GuardfractionFile /gff
GuardLifetime 691200
HeartbeatPeriod 2700
IPv6Exit 1
KeepalivePeriod 540
KeyDirectory /keyz
KISTSchedRunInterval 1
Log notice file /logfile
Log info file /logfile-verbose
LogTimeGranularity 60000
LongLivedPorts 9090
MainloopStats 1
MapAddress www.example.com:10.0.0.6
MaxAdvertisedBandwidth 100
MaxCircuitDirtiness 3600
MaxClientCircuitsPending 127
MaxConsensusAgeForDiffs 2629728
MaxMemInQueues 314572800
MaxOnionQueueDelay 60000
MaxUnparseableDescSizeToLog 1048576
MiddleNodes grommit,truffle,parcheesi
MyFamily $ffffffffffffffffffffffffffffffffffffffff
NewCircuitPeriod 7200
Nickname nickname
NodeFamily $ffffffffffffffffffffffffffffffffffffffff,$dddddddddddddddddddddddddddddddddddddddd
NumCPUs 3
NumDirectoryGuards 4
NumEntryGuards 5
NumPrimaryGuards 8
OfflineMasterKey 1
OptimisticData 1
ORPort 2222
OutboundBindAddress 10.0.0.7
OutboundBindAddressExit 10.0.0.8
OutboundBindAddressOR 10.0.0.9
PerConnBWBurst 10485760
PerConnBWRate 102400
PidFile /piddy
ProtocolWarnings 1
PublishHidServDescriptors 0
PublishServerDescriptor 0
ReachableAddresses 0.0.0.0, *:*
ReachableDirAddresses 128.0.0.0/1
ReachableORAddresses 128.0.0.0/8
RejectPlaintextPorts 23
RelayBandwidthBurst 10000
RelayBandwidthRate 1000
RendPostPeriod 600
RephistTrackTime 600
SafeLogging 0
Schedulers Vanilla,KISTLite,Kist
ShutdownWaitLength 10
SigningKeyLifetime 4838400
Socks5Proxy 128.66.99.99:99
Socks5ProxyPassword flynn
Socks5ProxyUsername spaceparanoids
SocksPolicy accept 127.0.0.0/24, reject *:*
SocksPort 9099
SocksTimeout 600
SSLKeyLifetime 86400
StrictNodes 1
SyslogIdentityTag tortor
TestSocks 1
TokenBucketRefillInterval 1000
TrackHostExits www.example.com
TrackHostExitsExpire 3600
TruncateLogFile 1
UnixSocksGroupWritable 1
UpdateBridgesFromAuthority 1
UseDefaultFallbackDirs 0
UseGuardFraction 1
UseMicrodescriptors 0
VirtualAddrNetworkIPv4 18.66.0.0/16
VirtualAddrNetworkIPv6 [ff00::]/16
WarnPlaintextPorts 7,11,23,1001
AccountingMax 10 GB
AccountingRule sum
AccountingStart day 05:15
Address 128.66.8.8
AllowNonRFC953Hostnames 1
AndroidIdentityTag droidy
AutomapHostsOnResolve 1
AutomapHostsSuffixes .onions
AvoidDiskWrites 1
BandwidthBurst 2 GB
BandwidthRate 1.5 GB
Bridge 128.66.1.10:80
CacheDirectory /this-is-a-cache
CellStatistics 1
CircuitBuildTimeout 200
CircuitPadding 1
CircuitsAvailableTimeout 10
CircuitStreamTimeout 20
ClientAutoIPv6ORPort 1
ClientOnly 1
ClientPreferIPv6DirPort 1
ClientPreferIPv6ORPort 1
ClientRejectInternalAddresses 0
ClientUseIPv4 0
ClientUseIPv6 1
ConnDirectionStatistics 1
ConnectionPadding 1
ConnLimit 64
ConsensusParams wombat=7
ConstrainedSockets 1
ConstrainedSockSize 10240
ContactInfo long_config@example.com
ControlPortFileGroupReadable 1
ControlPort 9058
CookieAuthentication 1
CookieAuthFile /control/cookie
CookieAuthFileGroupReadable 1
CountPrivateBandwidth 1
DataDirectory /data/dir
DirAllowPrivateAddresses 1
DirPolicy reject 128.66.1.1/32, accept *:*
DirReqStatistics 0
DirPort 99
DirPortFrontPage /dirport/frontpage
DisableDebuggerAttachment 0
DisableNetwork 1
DisableOOSCheck 0
DNSPort 53535
DormantCanceledByStartup 1
DormantClientTimeout 21 minutes
DormantOnFirstStartup 1
DormantTimeoutDisabledByIdleStreams 0
DoSCircuitCreationBurst 1000
DoSCircuitCreationDefenseTimePeriod 5 minutes
DoSCircuitCreationDefenseType 2
DoSCircuitCreationEnabled 1
DoSCircuitCreationMinConnections 10
DoSCircuitCreationRate 100
DoSConnectionDefenseType 2
DoSConnectionEnabled 1
DoSConnectionMaxConcurrentCount 6
DoSRefuseSingleHopClientRendezvous 0
DownloadExtraInfo 1
EnforceDistinctSubnets 0
EntryNodes potrzebie,triffid,cromulent
EntryStatistics 1
ExcludeExitNodes blaznort,kriffid,zeppelin
ExcludeNodes 128.66.7.6
ExitNodes 128.66.7.7,128.66.128.0/17,exitexit
ExitPolicy accept *:80,reject *:*
ExitPolicyRejectLocalInterfaces 1
ExitPolicyRejectPrivate 0
ExitPortStatistics 1
ExitRelay 1
ExtendAllowPrivateAddresses 1
ExtendByEd25519ID 1
ExtORPort 99
ExtORPortCookieAuthFile /foobar
ExtraInfoStatistics 1
FascistFirewall 1
FetchDirInfoEarly 1
FetchDirInfoExtraEarly 1
FetchHidServDescriptors 1
FetchServerDescriptors 1
FetchUselessDescriptors 1
FirewallPorts 80,443,999
GeoIPExcludeUnknown 1
GeoIPFile /geoip
GuardfractionFile /gff
GuardLifetime 8 days
HeartbeatPeriod 45 minutes
IPv6Exit 1
KeepalivePeriod 9 minutes
KeyDirectory /keyz
KISTSchedRunInterval 1 msec
LearnCircuitBuildTimeout 1
Log notice file /logfile
Log info file /logfile-verbose
LogTimeGranularity 1 minute
LongLivedPorts 9090
MainloopStats 1
MapAddress www.example.com:10.0.0.6
MaxAdvertisedBandwidth 100
MaxCircuitDirtiness 1 hour
MaxClientCircuitsPending 127
MaxConsensusAgeForDiffs 1 month
MaxMemInQueues 300 MB
MaxOnionQueueDelay 60 seconds
MaxUnparseableDescSizeToLog 1 MB
MiddleNodes grommit, truffle, parcheesi
MyFamily $ffffffffffffffffffffffffffffffffffffffff
NewCircuitPeriod 2 hours
Nickname nickname
NodeFamily $ffffffffffffffffffffffffffffffffffffffff,$dddddddddddddddddddddddddddddddddddddddd
NumCPUs 3
NumDirectoryGuards 4
NumEntryGuards 5
NumPrimaryGuards 8
OfflineMasterKey 1
OptimisticData 1
ORPort 2222
OutboundBindAddress 10.0.0.7
OutboundBindAddressExit 10.0.0.8
OutboundBindAddressOR 10.0.0.9
PaddingStatistics 1
PerConnBWBurst 10 MB
PerConnBWRate 100 kb
PidFile /piddy
ProtocolWarnings 1
PublishHidServDescriptors 0
PublishServerDescriptor 0
ReachableAddresses 0.0.0.0, *:*
ReachableDirAddresses 128.0.0.0/1
ReachableORAddresses 128.0.0.0/8
RejectPlaintextPorts 23
RelayBandwidthBurst 10000
RelayBandwidthRate 1000
RendPostPeriod 10 minutes
RephistTrackTime 10 minutes
SafeLogging 0
SafeSocks 0
Schedulers Vanilla,KISTLite,Kist
ShutdownWaitLength 10 seconds
SigningKeyLifetime 8 weeks
Socks5Proxy 128.66.99.99:99
Socks5ProxyPassword flynn
Socks5ProxyUsername spaceparanoids
SocksPolicy accept 127.0.0.0/24, reject *:*
SocksPort 9099
SocksTimeout 10 minutes
SSLKeyLifetime 1 day
StrictNodes 1
SyslogIdentityTag tortor
TestSocks 1
TokenBucketRefillInterval 1 second
TrackHostExits www.example.com
TrackHostExitsExpire 1 hour
TruncateLogFile 1
UnixSocksGroupWritable 1
UpdateBridgesFromAuthority 1
UseDefaultFallbackDirs 0
UseEntryGuards 1
UseGuardFraction 1
UseMicrodescriptors 0
VirtualAddrNetworkIPv4 18.66.0.0/16
VirtualAddrNetworkIPv6 [ff00::]/16
WarnPlaintextPorts 7,11,23,1001
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment