commit 7ee9347844f7cb28360aa0a06c97ba345be51f97 Author: Damian Johnson <atagar@torproject.org> Date: Sun Feb 28 10:22:00 2016 -0800 Tor manual now has TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries Resyncing cached data. We can drop a hack from our tests now that https://trac.torproject.org/projects/tor/ticket/17913 is merged. --- docs/change_log.rst | 1 + stem/cached_tor_manual.cfg | 9 +- stem/descriptor/fallback_directories.cfg | 140 ++++++++++++++++++++----------- test/integ/manual.py | 3 - 4 files changed, 98 insertions(+), 55 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 7af44da..57667e1 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -67,6 +67,7 @@ The following are only available within Stem's `git repository * Unable to read descriptors from data directories on Windows due to their CRLF newlines (:trac:`17051`) * TypeError under python3 when using 'use_mirrors = True' (:trac:`17083`) * Deprecated hidden service descriptor's *introduction_points_auth* field, which was never implemented in tor (:trac:`15190`, :spec:`9c218f9`) + * :func:`~stem.control.Controller.get_hidden_service_descriptor` errored when provided a *servers* argument (:trac:`18401`) * Fixed parsing of server descriptor's *allow-single-hop-exits* and *caches-extra-info* lines * Bracketed IPv6 addresses were mistreated as being invalid content * Updated dannenberg's v3ident (:trac:`17906`) diff --git a/stem/cached_tor_manual.cfg b/stem/cached_tor_manual.cfg index 7a98873..a2dbaf7 100644 --- a/stem/cached_tor_manual.cfg +++ b/stem/cached_tor_manual.cfg @@ -6,8 +6,8 @@ description |Basically, Tor provides a distributed network of servers or relays ("onion routers"). Users bounce their TCP streams -- web traffic, ftp, ssh, etc. -- around the network, and recipients, observers, and even the relays themselves have difficulty tracking the source of the stream. | |By default, tor will only act as a client only. To help the network by providing bandwidth as a relay, change the ORPort configuration option -- see below. Please also consult the documentation on the Tor Project's website. -man_commit ba2be81fc36ba6140247873799b747605fb07bd4 -stem_commit fc35ea1a74b6f9a95b6d1c2d21069f837dc725bb +man_commit af88e8f23742c810f478410fba60c43812dde85d +stem_commit 988aeb121b762f58712bda078d1f13ffa0819bfb commandline_options -f FILE => Specify a new configuration file to contain further Tor configuration options OR pass - to make Tor read its configuration from standard input. (Default: @CONFDIR@/torrc, or $HOME/.torrc if that file is not found) commandline_options --ignore-missing-torrc => Specifies that Tor should treat a missing torrc file as though it were empty. Ordinarily, Tor does this for missing default torrc files, but not for those specified on the command line. commandline_options --list-fingerprint => Generate your keys and output your nickname and fingerprint. @@ -1611,6 +1611,11 @@ config_options.TestingClientBootstrapConsensusMaxDownloadTries.name TestingClien config_options.TestingClientBootstrapConsensusMaxDownloadTries.usage NUM config_options.TestingClientBootstrapConsensusMaxDownloadTries.summary Number of times to attempt downloading consensus config_options.TestingClientBootstrapConsensusMaxDownloadTries.description Try this many times to download a consensus while bootstrapping using fallback directory mirrors before giving up. Changing this requires that TestingTorNetwork is set. (Default: 7) +config_options.TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries.category Testing +config_options.TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries.name TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries +config_options.TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries.usage NUM +config_options.TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries.summary +config_options.TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries.description Try this many times to download a consensus while bootstrapping using authorities before giving up. Changing this requires that TestingTorNetwork is set. (Default: 4) config_options.TestingClientBootstrapConsensusMaxInProgressTries.category Testing config_options.TestingClientBootstrapConsensusMaxInProgressTries.name TestingClientBootstrapConsensusMaxInProgressTries config_options.TestingClientBootstrapConsensusMaxInProgressTries.usage NUM diff --git a/stem/descriptor/fallback_directories.cfg b/stem/descriptor/fallback_directories.cfg index 158378d..91fd02a 100644 --- a/stem/descriptor/fallback_directories.cfg +++ b/stem/descriptor/fallback_directories.cfg @@ -1,13 +1,9 @@ -tor_commit ab3c86479a516073e0b445846a22b0e24ce8078e -stem_commit 645017a5f8c17b143e90602fdfe6c03a1a994a1c +tor_commit e2202146d16af22502fd4166ac926fefa6528dff +stem_commit 988aeb121b762f58712bda078d1f13ffa0819bfb Doedel22.address 178.254.44.135 Doedel22.or_port 9001 Doedel22.dir_port 9030 Doedel22.fingerprint 8FA37B93397015B2BC5A525C908485260BE9F422 -tornoderdednl.address 178.62.199.226 -tornoderdednl.or_port 443 -tornoderdednl.dir_port 80 -tornoderdednl.fingerprint CBEFF7BA4A4062045133C053F2D70524D8BBE5BE Logforme.address 84.219.173.60 Logforme.or_port 443 Logforme.dir_port 9030 @@ -16,50 +12,50 @@ Doedel21.address 178.254.44.135 Doedel21.or_port 443 Doedel21.dir_port 80 Doedel21.fingerprint AE6A8C18E7499B586CD36246AC4BCAFFBBF93AB2 -BabylonNetwork02.address 149.202.98.161 -BabylonNetwork02.or_port 443 -BabylonNetwork02.dir_port 80 -BabylonNetwork02.fingerprint 54660C671B47E6986B465B80444414BD19E5A34B +kitten4.address 212.47.237.95 +kitten4.or_port 9101 +kitten4.dir_port 9130 +kitten4.fingerprint 6FB38EB22E57EF7ED5EF00238F6A48E553735D88 +kitten3.address 212.47.237.95 +kitten3.or_port 9001 +kitten3.dir_port 9030 +kitten3.fingerprint 3F5D8A879C58961BB45A3D26AC41B543B40236D6 +Unnamed.address 217.12.199.208 +Unnamed.or_port 443 +Unnamed.dir_port 80 +Unnamed.fingerprint DF3AED4322B1824BF5539AE54B2D1B38E080FF05 +coby.address 51.255.33.237 +coby.or_port 9001 +coby.dir_port 9091 +coby.fingerprint A360C21FA87FFA2046D92C17086A6B47E5C68109 +Binnacle.address 108.53.208.157 +Binnacle.or_port 443 +Binnacle.dir_port 80 +Binnacle.fingerprint 4F0DB7E687FC7C0AE55C8F243DA8B0EB27FBF1F2 fluxe3.address 78.47.18.110 fluxe3.or_port 80 fluxe3.dir_port 443 fluxe3.fingerprint F8D27B163B9247B232A2EEE68DD8B698695C28DE -kili.address 178.62.173.203 -kili.or_port 9001 -kili.dir_port 9030 -kili.fingerprint DD85503F2D1F52EF9EAD621E942298F46CD2FC10 +rueckgrat.address 5.9.110.236 +rueckgrat.or_port 9001 +rueckgrat.dir_port 9030 +rueckgrat.fingerprint 0756B7CD4DFC8182BE23143FAC0642F515182CEB +Nurnberg01.address 213.239.210.204 +Nurnberg01.or_port 443 +Nurnberg01.dir_port 22 +Nurnberg01.fingerprint 5BFDECCE9B4A23AE14EC767C5A2C1E10558B00B9 wagner.address 5.175.233.86 wagner.or_port 443 wagner.dir_port 80 wagner.fingerprint 5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33 -fluxe4.address 131.188.40.188 -fluxe4.or_port 80 -fluxe4.dir_port 443 -fluxe4.fingerprint EBE718E1A49EE229071702964F8DB1F318075FF8 kitten2.address 62.210.124.124 kitten2.or_port 9101 kitten2.dir_port 9130 kitten2.fingerprint 2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E -coby.address 51.255.33.237 -coby.or_port 9001 -coby.dir_port 9091 -coby.fingerprint A360C21FA87FFA2046D92C17086A6B47E5C68109 -GrmmlLitavis.address 5.39.88.19 -GrmmlLitavis.or_port 9001 -GrmmlLitavis.dir_port 9030 -GrmmlLitavis.fingerprint 7CB8C31432A796731EA7B6BF4025548DFEB25E0C -Doedel24.address 178.254.20.134 -Doedel24.or_port 9001 -Doedel24.dir_port 9030 -Doedel24.fingerprint 2CE96A8A1DA032664C90F574AFFBECE18A6E8DFC -BabylonNetwork03.address 193.111.136.162 -BabylonNetwork03.or_port 443 -BabylonNetwork03.dir_port 80 -BabylonNetwork03.fingerprint C79552275DFCD486B942510EF663ED36ACA1A84B -Unnamed.address 217.12.199.208 -Unnamed.or_port 443 -Unnamed.dir_port 80 -Unnamed.fingerprint DF3AED4322B1824BF5539AE54B2D1B38E080FF05 +Nurnberg02.address 213.239.220.25 +Nurnberg02.or_port 443 +Nurnberg02.dir_port 22 +Nurnberg02.fingerprint BEE2317AE127EB681C5AE1551C1EA0630580638A eriador.address 85.25.138.93 eriador.or_port 4029 eriador.dir_port 9030 @@ -68,19 +64,63 @@ Doedel26.address 178.254.20.134 Doedel26.or_port 443 Doedel26.dir_port 80 Doedel26.fingerprint 9F5068310818ED7C70B0BC4087AB55CB12CB4377 -PedicaboMundi.address 144.76.14.145 -PedicaboMundi.or_port 143 -PedicaboMundi.dir_port 110 -PedicaboMundi.fingerprint 14419131033443AE6E21DA82B0D307F7CAE42BDB kitten1.address 62.210.124.124 kitten1.or_port 9001 kitten1.dir_port 9030 kitten1.fingerprint 86E78DD3720C78DA8673182EF96C54B162CD660C -Binnacle.address 108.53.208.157 -Binnacle.or_port 443 -Binnacle.dir_port 80 -Binnacle.fingerprint 4F0DB7E687FC7C0AE55C8F243DA8B0EB27FBF1F2 -kitten4.address 212.47.237.95 -kitten4.or_port 9101 -kitten4.dir_port 9130 -kitten4.fingerprint 6FB38EB22E57EF7ED5EF00238F6A48E553735D88 +bakunin.address 178.16.208.57 +bakunin.or_port 443 +bakunin.dir_port 80 +bakunin.fingerprint 92CFD9565B24646CAC2D172D3DB503D69E777B8A +PedicaboMundi.address 144.76.14.145 +PedicaboMundi.or_port 143 +PedicaboMundi.dir_port 110 +PedicaboMundi.fingerprint 14419131033443AE6E21DA82B0D307F7CAE42BDB +tornoderdednl.address 178.62.199.226 +tornoderdednl.or_port 443 +tornoderdednl.dir_port 80 +tornoderdednl.fingerprint CBEFF7BA4A4062045133C053F2D70524D8BBE5BE +ratchet.address 170.130.1.7 +ratchet.or_port 9001 +ratchet.dir_port 9030 +ratchet.fingerprint FA3415659444AE006E7E9E5375E82F29700CFDFD +Freebird32.address 178.254.13.126 +Freebird32.or_port 9001 +Freebird32.dir_port 9030 +Freebird32.fingerprint 0C475BA4D3AA3C289B716F95954CAD616E50C4E5 +Freebird31.address 178.254.13.126 +Freebird31.or_port 443 +Freebird31.dir_port 80 +Freebird31.fingerprint F9246DEF2B653807236DA134F2AEAB103D58ABFE +12xBTME1.address 81.7.17.171 +12xBTME1.or_port 443 +12xBTME1.dir_port 80 +12xBTME1.fingerprint 00C4B4731658D3B4987132A3F77100CFCB190D97 +kili.address 178.62.173.203 +kili.or_port 9001 +kili.dir_port 9030 +kili.fingerprint DD85503F2D1F52EF9EAD621E942298F46CD2FC10 +fluxe4.address 131.188.40.188 +fluxe4.or_port 80 +fluxe4.dir_port 443 +fluxe4.fingerprint EBE718E1A49EE229071702964F8DB1F318075FF8 +pixelminer.address 81.7.14.246 +pixelminer.or_port 443 +pixelminer.dir_port 80 +pixelminer.fingerprint CE75BF0972ADD52AF8807602374E495C815DB304 +Nurnberg04.address 88.198.38.226 +Nurnberg04.or_port 443 +Nurnberg04.dir_port 22 +Nurnberg04.fingerprint 4B9E2C56FB42B891794FE2CD2FCAD08A320CC3BB +Nurnberg03.address 85.10.201.38 +Nurnberg03.or_port 443 +Nurnberg03.dir_port 22 +Nurnberg03.fingerprint F6279A203C1950ACF592322A235647A05BFBCF91 +Doedel24.address 178.254.20.134 +Doedel24.or_port 9001 +Doedel24.dir_port 9030 +Doedel24.fingerprint 2CE96A8A1DA032664C90F574AFFBECE18A6E8DFC +horizons.address 167.114.35.28 +horizons.or_port 9001 +horizons.dir_port 9030 +horizons.fingerprint E65D300F11E1DB12C534B0146BDAB6972F1A8A48 diff --git a/test/integ/manual.py b/test/integ/manual.py index d877c74..d20c407 100644 --- a/test/integ/manual.py +++ b/test/integ/manual.py @@ -302,9 +302,6 @@ class TestManual(unittest.TestCase): missing_from_manual = config_options_in_tor.difference(config_options_in_manual) - if 'TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries' in missing_from_manual: - missing_from_manual.remove('TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries') # https://trac.torproject.org/projects/tor/ticket/17913 - if missing_from_manual: self.fail("The %s config options supported by tor isn't in its man page. Maybe we need to add them?" % ', '.join(missing_from_manual))