May 2017 - tor-commits - lists.torproject.org

[tor/release-0.2.9] Stop leaking keypin-rejected routerinfos on directory authorities
by arma＠torproject.org 25 May '17

25 May '17

commit ec61ae59a5d009a9e80f3bfa9a2aa5f5dfa05551 Author: teor <teor2345(a)gmail.com> Date: Thu May 25 12:30:21 2017 +1000 Stop leaking keypin-rejected routerinfos on directory authorities When directory authorities reject a router descriptor due to keypinning, free the router descriptor rather than leaking the memory. Fixes bug 22370; bugfix on 0.2.7.2-alpha. --- changes/bug22370 | 4 ++++ src/or/dirserv.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changes/bug22370 b/changes/bug22370 new file mode 100644 index 0000000..e0e87e3 --- /dev/null +++ b/changes/bug22370 @@ -0,0 +1,4 @@ + o Minor bugfixes (memory handling): + - When directory authorities reject a router descriptor due to keypinning, + free the router descriptor rather than leaking the memory. + Fixes bug 22370; bugfix on 0.2.7.2-alpha. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index fedbe51..7244108 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -626,7 +626,11 @@ dirserv_add_multiple_descriptors(const char *desc, uint8_t purpose, * passed back to the origin of this descriptor, or NULL if there is no such * message. Use source to produce better log messages. * - * Return the status of the operation + * If ri is not added to the list of server descriptors, free it. + * That means the caller must not access ri after this function + * returns, since it might have been freed. + * + * Return the status of the operation. * * This function is only called when fresh descriptors are posted, not when * we re-load the cache. @@ -699,6 +703,7 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source) "its key did not match an older RSA/Ed25519 keypair", router_describe(ri), source); *msg = "Looks like your keypair does not match its older value."; + routerinfo_free(ri); return ROUTER_AUTHDIR_REJECTS; }

1 0

[tor/maint-0.2.9] Stop leaking keypin-rejected routerinfos on directory authorities
by arma＠torproject.org 25 May '17

25 May '17

commit ec61ae59a5d009a9e80f3bfa9a2aa5f5dfa05551 Author: teor <teor2345(a)gmail.com> Date: Thu May 25 12:30:21 2017 +1000 Stop leaking keypin-rejected routerinfos on directory authorities When directory authorities reject a router descriptor due to keypinning, free the router descriptor rather than leaking the memory. Fixes bug 22370; bugfix on 0.2.7.2-alpha. --- changes/bug22370 | 4 ++++ src/or/dirserv.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changes/bug22370 b/changes/bug22370 new file mode 100644 index 0000000..e0e87e3 --- /dev/null +++ b/changes/bug22370 @@ -0,0 +1,4 @@ + o Minor bugfixes (memory handling): + - When directory authorities reject a router descriptor due to keypinning, + free the router descriptor rather than leaking the memory. + Fixes bug 22370; bugfix on 0.2.7.2-alpha. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index fedbe51..7244108 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -626,7 +626,11 @@ dirserv_add_multiple_descriptors(const char *desc, uint8_t purpose, * passed back to the origin of this descriptor, or NULL if there is no such * message. Use source to produce better log messages. * - * Return the status of the operation + * If ri is not added to the list of server descriptors, free it. + * That means the caller must not access ri after this function + * returns, since it might have been freed. + * + * Return the status of the operation. * * This function is only called when fresh descriptors are posted, not when * we re-load the cache. @@ -699,6 +703,7 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source) "its key did not match an older RSA/Ed25519 keypair", router_describe(ri), source); *msg = "Looks like your keypair does not match its older value."; + routerinfo_free(ri); return ROUTER_AUTHDIR_REJECTS; }

1 0

[chutney/master] Use POSIX shell arithmetic syntax, not a bashism
by teor＠torproject.org 25 May '17

25 May '17

commit 9e48988877c848faa9d398b5486ebf313c48a816 Author: Taylor Yu <tlyu(a)mit.edu> Date: Fri May 19 15:01:11 2017 -0400 Use POSIX shell arithmetic syntax, not a bashism Some distributions have a /bin/sh that isn't bash. Use POSIX syntax for shell arithmetic, instead of a deprecated bash-specific syntax. Fixes 22302. --- tools/test-network.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test-network.sh b/tools/test-network.sh index d77003b..2be5558 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -303,7 +303,7 @@ if [ "$CHUTNEY_BOOTSTRAP_TIME" -ge 0 ]; then -a "$VERIFY_EXIT_STATUS" -eq 0 ]; do "$CHUTNEY" verify "$CHUTNEY_NETWORK" VERIFY_EXIT_STATUS="$?" - n_rounds=$[n_rounds+1] + n_rounds=$((n_rounds+1)) done $ECHO "Completed $n_rounds of $CHUTNEY_ROUNDS verify rounds." else

1 0

[chutney/master] Use LogTimeGranularity 1 because precision is sometimes useful
by teor＠torproject.org 25 May '17

25 May '17

commit c3b5e393d7227ff96557cb21ecc253c9f8dc1790 Author: teor <teor2345(a)gmail.com> Date: Thu May 25 14:23:16 2017 +1000 Use LogTimeGranularity 1 because precision is sometimes useful Implements #22373. --- torrc_templates/common.i | 1 + 1 file changed, 1 insertion(+) diff --git a/torrc_templates/common.i b/torrc_templates/common.i index 5213823..884878b 100644 --- a/torrc_templates/common.i +++ b/torrc_templates/common.i @@ -56,5 +56,6 @@ Log info file ${dir}/info.log #Log debug file ${dir}/debug.log ProtocolWarnings 1 SafeLogging 0 +LogTimeGranularity 1 ${authorities}

1 0

[stem/master] Make path check platform agnostic
by atagar＠torproject.org 24 May '17

24 May '17

commit 49ec33ebca2e4c77ab13b986dcaf904cd1277b99 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 24 14:38:51 2017 -0700 Make path check platform agnostic Good catch from Roger that this wouldn't expand Windows paths. --- test/runner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/runner.py b/test/runner.py index 9430e82..b40ca19 100644 --- a/test/runner.py +++ b/test/runner.py @@ -197,7 +197,7 @@ class Runner(object): self._test_dir = tempfile.mktemp('-stem-integ') original_cwd, data_dir_path = os.getcwd(), self._test_dir - self._tor_cmd = stem.util.system.expand_path(tor_cmd) if '/' in tor_cmd else tor_cmd + self._tor_cmd = stem.util.system.expand_path(tor_cmd) if os.path.sep in tor_cmd else tor_cmd if test.Target.RELATIVE in self.attribute_targets: tor_cwd = os.path.dirname(self._test_dir)

1 0

[stem/master] Update manual and fallback caches
by atagar＠torproject.org 24 May '17

24 May '17

commit ca179b54a54618924930eb4fc40a17e114303c03 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 24 14:38:14 2017 -0700 Update manual and fallback caches --- stem/cached_tor_manual.cfg | 16 +- stem/descriptor/fallback_directories.cfg | 310 ++++++++++++------------------- stem/settings.cfg | 2 - 3 files changed, 118 insertions(+), 210 deletions(-) diff --git a/stem/cached_tor_manual.cfg b/stem/cached_tor_manual.cfg index e45986b..a25c860 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 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 18e59fdc1cfa4757c8b440a344b11bd521143a00 -stem_commit fb0812b2383178055f6343a8e8422c295376a374 +man_commit ba3a5f82f11388237a3ba4995ddf0b6ffaaf492a +stem_commit 5c2c55012aea1175855d485800587ca5a2cc8aed 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-deprecated-options => List all valid options that are scheduled to become obsolete in a future version. (This is a warning, not a promise.) @@ -102,11 +102,6 @@ config_options.CircuitsAvailableTimeout.name CircuitsAvailableTimeout config_options.CircuitsAvailableTimeout.usage NUM config_options.CircuitsAvailableTimeout.summary Time to keep circuits open and unused for config_options.CircuitsAvailableTimeout.description Tor will attempt to keep at least one open, unused circuit available for this amount of time. This option governs how long idle circuits are kept open, as well as the amount of time Tor will keep a circuit open to each of the recently used ports. This way when the Tor client is entirely idle, it can expire all of its circuits, and then expire its TLS connections. Note that the actual timeout value is uniformly randomized from the specified value to twice that amount. (Default: 30 minutes; Max: 24 hours) -config_options.CircuitIdleTimeout.category Client -config_options.CircuitIdleTimeout.name CircuitIdleTimeout -config_options.CircuitIdleTimeout.usage NUM -config_options.CircuitIdleTimeout.summary Timeout for closing circuits that have never been used -config_options.CircuitIdleTimeout.description If we have kept a clean (never used) circuit around for NUM seconds, then close it. This option is deprecated. Use CircuitsAvailableTimeout instead. config_options.CircuitStreamTimeout.category Client config_options.CircuitStreamTimeout.name CircuitStreamTimeout config_options.CircuitStreamTimeout.usage NUM @@ -1033,7 +1028,7 @@ config_options.OutboundBindAddressOR.category General config_options.OutboundBindAddressOR.name OutboundBindAddressOR config_options.OutboundBindAddressOR.usage IP config_options.OutboundBindAddressOR.summary Make outbound non-exit connections originate from this address -config_options.OutboundBindAddressOR.description Make all outbound non-exit (=relay and other) connections originate from the IP address specified. This option overrides OutboundBindAddress for the same IP version. This option may be used twice, once with an IPv4 address and once with an IPv6 address. This setting will be ignored for connections to the loopback addresses (127.0.0.0/8 and ::1). +config_options.OutboundBindAddressOR.description Make all outbound non-exit (relay and other) connections originate from the IP address specified. This option overrides OutboundBindAddress for the same IP version. This option may be used twice, once with an IPv4 address and once with an IPv6 address. This setting will be ignored for connections to the loopback addresses (127.0.0.0/8 and ::1). config_options.OutboundBindAddressExit.category General config_options.OutboundBindAddressExit.name OutboundBindAddressExit config_options.OutboundBindAddressExit.usage IP @@ -1049,11 +1044,6 @@ config_options.ProtocolWarnings.name ProtocolWarnings config_options.ProtocolWarnings.usage 0|1 config_options.ProtocolWarnings.summary Toggles if protocol errors give warnings or not config_options.ProtocolWarnings.description If 1, Tor will log with severity 'warn' various cases of other parties not following the Tor specification. Otherwise, they are logged with severity 'info'. (Default: 0) -config_options.PredictedPortsRelevanceTime.category General -config_options.PredictedPortsRelevanceTime.name PredictedPortsRelevanceTime -config_options.PredictedPortsRelevanceTime.usage NUM -config_options.PredictedPortsRelevanceTime.summary Duration to ensure circuits for previously used ports remain available -config_options.PredictedPortsRelevanceTime.description Set how long, after the client has made an anonymized connection to a given port, we will try to make sure that we build circuits to exits that support that port. This option is deprecated. Please use CircuitsAvailableTimeout instead. config_options.RunAsDaemon.category General config_options.RunAsDaemon.name RunAsDaemon config_options.RunAsDaemon.usage 0|1 diff --git a/stem/descriptor/fallback_directories.cfg b/stem/descriptor/fallback_directories.cfg index 234f80b..009ca27 100644 --- a/stem/descriptor/fallback_directories.cfg +++ b/stem/descriptor/fallback_directories.cfg @@ -1,22 +1,25 @@ -tor_commit 4181e812c75a7a1d8d70f29a404d23e6ab875891 -stem_commit 84ef872f52932cb4e5b19f0358d24c44347c1fa3 -001524DD403D729F08F7E5D77813EF12756CFA8D.address 185.13.39.197 -001524DD403D729F08F7E5D77813EF12756CFA8D.or_port 443 -001524DD403D729F08F7E5D77813EF12756CFA8D.dir_port 80 +tor_commit 5b45d73293e4f1cb4b1b59e673f3c12c782c5bff +stem_commit 5c2c55012aea1175855d485800587ca5a2cc8aed +0111BA9B604669E636FFD5B503F382A4B7AD6E80.address 176.10.104.240 +0111BA9B604669E636FFD5B503F382A4B7AD6E80.or_port 443 +0111BA9B604669E636FFD5B503F382A4B7AD6E80.dir_port 80 +01A9258A46E97FF8B2CAC7910577862C14F2C524.address 193.171.202.146 +01A9258A46E97FF8B2CAC7910577862C14F2C524.or_port 9001 +01A9258A46E97FF8B2CAC7910577862C14F2C524.dir_port 9030 025B66CEBC070FCB0519D206CF0CF4965C20C96E.address 185.100.85.61 025B66CEBC070FCB0519D206CF0CF4965C20C96E.or_port 443 025B66CEBC070FCB0519D206CF0CF4965C20C96E.dir_port 80 -0266B0660F3F20A7D1F3D8335931C95EF50F6C6B.address 62.210.92.11 -0266B0660F3F20A7D1F3D8335931C95EF50F6C6B.or_port 9001 -0266B0660F3F20A7D1F3D8335931C95EF50F6C6B.dir_port 9030 -0266B0660F3F20A7D1F3D8335931C95EF50F6C6B.orport6_address 2001:bc8:338c::1 -0266B0660F3F20A7D1F3D8335931C95EF50F6C6B.orport6_port 9001 04250C3835019B26AA6764E85D836088BE441088.address 185.97.32.18 04250C3835019B26AA6764E85D836088BE441088.or_port 9001 04250C3835019B26AA6764E85D836088BE441088.dir_port 9030 -0639612FF149AA19DF3BCEA147E5B8FED6F3C87C.address 92.222.20.130 -0639612FF149AA19DF3BCEA147E5B8FED6F3C87C.or_port 443 -0639612FF149AA19DF3BCEA147E5B8FED6F3C87C.dir_port 80 +0756B7CD4DFC8182BE23143FAC0642F515182CEB.address 5.9.110.236 +0756B7CD4DFC8182BE23143FAC0642F515182CEB.or_port 9001 +0756B7CD4DFC8182BE23143FAC0642F515182CEB.dir_port 9030 +0756B7CD4DFC8182BE23143FAC0642F515182CEB.orport6_address 2a01:4f8:162:51e2::2 +0756B7CD4DFC8182BE23143FAC0642F515182CEB.orport6_port 9001 +0818DAE0E2DDF795AEDEAC60B15E71901084F281.address 109.163.234.8 +0818DAE0E2DDF795AEDEAC60B15E71901084F281.or_port 443 +0818DAE0E2DDF795AEDEAC60B15E71901084F281.dir_port 80 0B85617241252517E8ECF2CFC7F4C1A32DCD153F.address 163.172.149.155 0B85617241252517E8ECF2CFC7F4C1A32DCD153F.or_port 443 0B85617241252517E8ECF2CFC7F4C1A32DCD153F.dir_port 80 @@ -25,18 +28,15 @@ stem_commit 84ef872f52932cb4e5b19f0358d24c44347c1fa3 0BEA4A88D069753218EAAAD6D22EA87B9A1319D6.dir_port 80 0BEA4A88D069753218EAAAD6D22EA87B9A1319D6.orport6_address 2001:41d0:8:b1c7::1 0BEA4A88D069753218EAAAD6D22EA87B9A1319D6.orport6_port 443 -0CF8F3E6590F45D50B70F2F7DA6605ECA6CD408F.address 163.172.25.118 -0CF8F3E6590F45D50B70F2F7DA6605ECA6CD408F.or_port 22 -0CF8F3E6590F45D50B70F2F7DA6605ECA6CD408F.dir_port 80 0D3EBA17E1C78F1E9900BABDB23861D46FCAF163.address 178.62.197.82 0D3EBA17E1C78F1E9900BABDB23861D46FCAF163.or_port 443 0D3EBA17E1C78F1E9900BABDB23861D46FCAF163.dir_port 80 0E8C0C8315B66DB5F703804B3889A1DD66C67CE0.address 185.100.86.100 0E8C0C8315B66DB5F703804B3889A1DD66C67CE0.or_port 443 0E8C0C8315B66DB5F703804B3889A1DD66C67CE0.dir_port 80 -0F100F60C7A63BED90216052324D29B08CFCF797.address 5.9.159.14 -0F100F60C7A63BED90216052324D29B08CFCF797.or_port 9001 -0F100F60C7A63BED90216052324D29B08CFCF797.dir_port 9030 +1211AC1BBB8A1AF7CBA86BCE8689AA3146B86423.address 95.85.8.226 +1211AC1BBB8A1AF7CBA86BCE8689AA3146B86423.or_port 443 +1211AC1BBB8A1AF7CBA86BCE8689AA3146B86423.dir_port 80 12AD30E5D25AA67F519780E2111E611A455FDC89.address 193.11.114.43 12AD30E5D25AA67F519780E2111E611A455FDC89.or_port 9001 12AD30E5D25AA67F519780E2111E611A455FDC89.dir_port 9030 @@ -45,15 +45,22 @@ stem_commit 84ef872f52932cb4e5b19f0358d24c44347c1fa3 12FD624EE73CEF37137C90D38B2406A66F68FAA2.address 37.157.195.87 12FD624EE73CEF37137C90D38B2406A66F68FAA2.or_port 443 12FD624EE73CEF37137C90D38B2406A66F68FAA2.dir_port 8030 +136F9299A5009A4E0E96494E723BDB556FB0A26B.address 178.16.208.59 +136F9299A5009A4E0E96494E723BDB556FB0A26B.or_port 443 +136F9299A5009A4E0E96494E723BDB556FB0A26B.dir_port 80 +136F9299A5009A4E0E96494E723BDB556FB0A26B.orport6_address 2a00:1c20:4089:1234:bff6:e1bb:1ce3:8dc6 +136F9299A5009A4E0E96494E723BDB556FB0A26B.orport6_port 443 +14419131033443AE6E21DA82B0D307F7CAE42BDB.address 144.76.14.145 +14419131033443AE6E21DA82B0D307F7CAE42BDB.or_port 143 +14419131033443AE6E21DA82B0D307F7CAE42BDB.dir_port 110 +14419131033443AE6E21DA82B0D307F7CAE42BDB.orport6_address 2a01:4f8:190:9490::dead +14419131033443AE6E21DA82B0D307F7CAE42BDB.orport6_port 443 175921396C7C426309AB03775A9930B6F611F794.address 178.62.60.37 175921396C7C426309AB03775A9930B6F611F794.or_port 443 175921396C7C426309AB03775A9930B6F611F794.dir_port 80 185F2A57B0C4620582602761097D17DB81654F70.address 204.11.50.131 185F2A57B0C4620582602761097D17DB81654F70.or_port 9001 185F2A57B0C4620582602761097D17DB81654F70.dir_port 9030 -1A6B8B8272632D8AD38442027F822A367128405C.address 92.222.4.102 -1A6B8B8272632D8AD38442027F822A367128405C.or_port 9001 -1A6B8B8272632D8AD38442027F822A367128405C.dir_port 9030 1AF72E8906E6C49481A791A6F8F84F8DFEBBB2BA.address 5.9.158.75 1AF72E8906E6C49481A791A6F8F84F8DFEBBB2BA.or_port 443 1AF72E8906E6C49481A791A6F8F84F8DFEBBB2BA.dir_port 80 @@ -65,45 +72,31 @@ stem_commit 84ef872f52932cb4e5b19f0358d24c44347c1fa3 1ECD73B936CB6E6B3CD647CC204F108D9DF2C9F7.address 91.219.237.229 1ECD73B936CB6E6B3CD647CC204F108D9DF2C9F7.or_port 443 1ECD73B936CB6E6B3CD647CC204F108D9DF2C9F7.dir_port 80 -1F45542A24A61BF9408F1C05E0DCE4E29F2CBA11.address 5.9.146.203 -1F45542A24A61BF9408F1C05E0DCE4E29F2CBA11.or_port 443 -1F45542A24A61BF9408F1C05E0DCE4E29F2CBA11.dir_port 80 20462CBA5DA4C2D963567D17D0B7249718114A68.address 212.47.229.2 20462CBA5DA4C2D963567D17D0B7249718114A68.or_port 9001 20462CBA5DA4C2D963567D17D0B7249718114A68.dir_port 9030 20462CBA5DA4C2D963567D17D0B7249718114A68.orport6_address 2001:bc8:4400:2100::f03 20462CBA5DA4C2D963567D17D0B7249718114A68.orport6_port 9001 -20704E7DD51501DC303FA51B738D7B7E61397CF6.address 91.219.236.222 -20704E7DD51501DC303FA51B738D7B7E61397CF6.or_port 443 -20704E7DD51501DC303FA51B738D7B7E61397CF6.dir_port 80 22F08CF09764C4E8982640D77F71ED72FF26A9AC.address 144.76.163.93 22F08CF09764C4E8982640D77F71ED72FF26A9AC.or_port 9001 22F08CF09764C4E8982640D77F71ED72FF26A9AC.dir_port 9030 230A8B2A8BA861210D9B4BA97745AEC217A94207.address 163.172.176.167 230A8B2A8BA861210D9B4BA97745AEC217A94207.or_port 443 230A8B2A8BA861210D9B4BA97745AEC217A94207.dir_port 80 +231C2B9C8C31C295C472D031E06964834B745996.address 37.200.98.5 +231C2B9C8C31C295C472D031E06964834B745996.or_port 443 +231C2B9C8C31C295C472D031E06964834B745996.dir_port 80 +231C2B9C8C31C295C472D031E06964834B745996.orport6_address 2a00:1158:3::11a +231C2B9C8C31C295C472D031E06964834B745996.orport6_port 993 2A4C448784F5A83AFE6C78DA357D5E31F7989DEB.address 212.47.240.10 2A4C448784F5A83AFE6C78DA357D5E31F7989DEB.or_port 443 2A4C448784F5A83AFE6C78DA357D5E31F7989DEB.dir_port 82 2BA2C8E96B2590E1072AECE2BDB5C48921BF8510.address 144.76.26.175 2BA2C8E96B2590E1072AECE2BDB5C48921BF8510.or_port 9011 2BA2C8E96B2590E1072AECE2BDB5C48921BF8510.dir_port 9012 -2CDCFED0142B28B002E89D305CBA2E26063FADE2.address 178.16.208.56 -2CDCFED0142B28B002E89D305CBA2E26063FADE2.or_port 443 -2CDCFED0142B28B002E89D305CBA2E26063FADE2.dir_port 80 -2CDCFED0142B28B002E89D305CBA2E26063FADE2.orport6_address 2a00:1c20:4089:1234:cd49:b58a:9ebe:67ec -2CDCFED0142B28B002E89D305CBA2E26063FADE2.orport6_port 443 -2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.address 62.210.124.124 -2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.or_port 9101 -2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.dir_port 9130 -2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.orport6_address 2001:bc8:3f23:100::1 -2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.orport6_port 9101 2F0F32AB1E5B943CA7D062C03F18960C86E70D94.address 97.74.237.196 2F0F32AB1E5B943CA7D062C03F18960C86E70D94.or_port 9001 2F0F32AB1E5B943CA7D062C03F18960C86E70D94.dir_port 9030 -30648BC64CEDB3020F4A405E4AB2A6347FB8FA22.address 213.61.66.118 -30648BC64CEDB3020F4A405E4AB2A6347FB8FA22.or_port 9001 -30648BC64CEDB3020F4A405E4AB2A6347FB8FA22.dir_port 9031 30973217E70AF00EBE51797FF6D9AA720A902EAA.address 107.170.101.39 30973217E70AF00EBE51797FF6D9AA720A902EAA.or_port 443 30973217E70AF00EBE51797FF6D9AA720A902EAA.dir_port 9030 @@ -118,19 +111,11 @@ stem_commit 84ef872f52932cb4e5b19f0358d24c44347c1fa3 32EE911D968BE3E016ECA572BB1ED0A9EE43FC2F.dir_port 52860 32EE911D968BE3E016ECA572BB1ED0A9EE43FC2F.orport6_address 2001:948:7:2::163 32EE911D968BE3E016ECA572BB1ED0A9EE43FC2F.orport6_port 5001 -330CD3DB6AD266DC70CDB512B036957D03D9BC59.address 185.100.84.212 -330CD3DB6AD266DC70CDB512B036957D03D9BC59.or_port 443 -330CD3DB6AD266DC70CDB512B036957D03D9BC59.dir_port 80 -330CD3DB6AD266DC70CDB512B036957D03D9BC59.orport6_address 2a06:1700:0:7::1 -330CD3DB6AD266DC70CDB512B036957D03D9BC59.orport6_port 443 33DA0CAB7C27812EFF2E22C9705630A54D101FEB.address 163.172.13.165 33DA0CAB7C27812EFF2E22C9705630A54D101FEB.or_port 9001 33DA0CAB7C27812EFF2E22C9705630A54D101FEB.dir_port 9030 33DA0CAB7C27812EFF2E22C9705630A54D101FEB.orport6_address 2001:bc8:38cb:201::8 33DA0CAB7C27812EFF2E22C9705630A54D101FEB.orport6_port 9001 -3473ED788D9E63361D1572B7E82EC54338953D2A.address 45.62.255.25 -3473ED788D9E63361D1572B7E82EC54338953D2A.or_port 443 -3473ED788D9E63361D1572B7E82EC54338953D2A.dir_port 80 361D33C96D0F161275EE67E2C91EE10B276E778B.address 217.79.190.25 361D33C96D0F161275EE67E2C91EE10B276E778B.or_port 9090 361D33C96D0F161275EE67E2C91EE10B276E778B.dir_port 9030 @@ -139,11 +124,11 @@ stem_commit 84ef872f52932cb4e5b19f0358d24c44347c1fa3 36B9E7AC1E36B62A9D6F330ABEB6012BA7F0D400.dir_port 9030 36B9E7AC1E36B62A9D6F330ABEB6012BA7F0D400.orport6_address 2001:41d0:a:1657::1 36B9E7AC1E36B62A9D6F330ABEB6012BA7F0D400.orport6_port 9001 -379FB450010D17078B3766C2273303C358C3A442.address 176.126.252.12 -379FB450010D17078B3766C2273303C358C3A442.or_port 8080 -379FB450010D17078B3766C2273303C358C3A442.dir_port 21 -379FB450010D17078B3766C2273303C358C3A442.orport6_address 2a02:59e0:0:7::12 -379FB450010D17078B3766C2273303C358C3A442.orport6_port 81 +387B065A38E4DAA16D9D41C2964ECBC4B31D30FF.address 62.210.92.11 +387B065A38E4DAA16D9D41C2964ECBC4B31D30FF.or_port 9101 +387B065A38E4DAA16D9D41C2964ECBC4B31D30FF.dir_port 9130 +387B065A38E4DAA16D9D41C2964ECBC4B31D30FF.orport6_address 2001:bc8:338c::1 +387B065A38E4DAA16D9D41C2964ECBC4B31D30FF.orport6_port 9101 39F096961ED2576975C866D450373A9913AFDC92.address 198.50.191.95 39F096961ED2576975C866D450373A9913AFDC92.or_port 443 39F096961ED2576975C866D450373A9913AFDC92.dir_port 80 @@ -153,17 +138,14 @@ stem_commit 84ef872f52932cb4e5b19f0358d24c44347c1fa3 3D6D0771E54056AEFC28BB1DE816951F11826E97.address 212.47.230.49 3D6D0771E54056AEFC28BB1DE816951F11826E97.or_port 9001 3D6D0771E54056AEFC28BB1DE816951F11826E97.dir_port 9030 +3D7E274A87D9A89AF064C13D1EE4CA1F184F2600.address 176.10.107.180 +3D7E274A87D9A89AF064C13D1EE4CA1F184F2600.or_port 9001 +3D7E274A87D9A89AF064C13D1EE4CA1F184F2600.dir_port 9030 3E53D3979DB07EFD736661C934A1DED14127B684.address 217.79.179.177 3E53D3979DB07EFD736661C934A1DED14127B684.or_port 9001 3E53D3979DB07EFD736661C934A1DED14127B684.dir_port 9030 3E53D3979DB07EFD736661C934A1DED14127B684.orport6_address 2001:4ba0:fff9:131:6c4f::90d3 3E53D3979DB07EFD736661C934A1DED14127B684.orport6_port 9001 -3F5D8A879C58961BB45A3D26AC41B543B40236D6.address 212.47.237.95 -3F5D8A879C58961BB45A3D26AC41B543B40236D6.or_port 9001 -3F5D8A879C58961BB45A3D26AC41B543B40236D6.dir_port 9030 -4061C553CA88021B8302F0814365070AAE617270.address 185.100.85.101 -4061C553CA88021B8302F0814365070AAE617270.or_port 9001 -4061C553CA88021B8302F0814365070AAE617270.dir_port 9030 439D0447772CB107B886F7782DBC201FA26B92D1.address 178.62.86.96 439D0447772CB107B886F7782DBC201FA26B92D1.or_port 9001 439D0447772CB107B886F7782DBC201FA26B92D1.dir_port 9030 @@ -202,9 +184,6 @@ stem_commit 84ef872f52932cb4e5b19f0358d24c44347c1fa3 51E1CF613FD6F9F11FE24743C91D6F9981807D82.dir_port 80 51E1CF613FD6F9F11FE24743C91D6F9981807D82.orport6_address 2a02:180:1:1::517:10b6 51E1CF613FD6F9F11FE24743C91D6F9981807D82.orport6_port 993 -52AEA31188331F421B2EDB494DB65CD181E5B257.address 138.201.130.32 -52AEA31188331F421B2EDB494DB65CD181E5B257.or_port 9001 -52AEA31188331F421B2EDB494DB65CD181E5B257.dir_port 9030 5665A3904C89E22E971305EE8C1997BCA4123C69.address 94.23.204.175 5665A3904C89E22E971305EE8C1997BCA4123C69.or_port 9001 5665A3904C89E22E971305EE8C1997BCA4123C69.dir_port 9030 @@ -219,37 +198,23 @@ stem_commit 84ef872f52932cb4e5b19f0358d24c44347c1fa3 5A5E03355C1908EBF424CAF1F3ED70782C0D2F74.address 78.142.142.246 5A5E03355C1908EBF424CAF1F3ED70782C0D2F74.or_port 443 5A5E03355C1908EBF424CAF1F3ED70782C0D2F74.dir_port 80 -5B92FA5C8A49D46D235735504C72DBB3472BA321.address 46.28.207.19 -5B92FA5C8A49D46D235735504C72DBB3472BA321.or_port 443 -5B92FA5C8A49D46D235735504C72DBB3472BA321.dir_port 80 5E853C94AB1F655E9C908924370A0A6707508C62.address 120.29.217.46 5E853C94AB1F655E9C908924370A0A6707508C62.or_port 443 5E853C94AB1F655E9C908924370A0A6707508C62.dir_port 80 +5EB8D862E70981B8690DEDEF546789E26AB2BD24.address 109.163.234.5 +5EB8D862E70981B8690DEDEF546789E26AB2BD24.or_port 443 +5EB8D862E70981B8690DEDEF546789E26AB2BD24.dir_port 80 616081EC829593AF4232550DE6FFAA1D75B37A90.address 95.128.43.164 616081EC829593AF4232550DE6FFAA1D75B37A90.or_port 443 616081EC829593AF4232550DE6FFAA1D75B37A90.dir_port 80 616081EC829593AF4232550DE6FFAA1D75B37A90.orport6_address 2a02:ec0:209:10::4 616081EC829593AF4232550DE6FFAA1D75B37A90.orport6_port 443 -64E99CB34C595A02A3165484BD1215E7389322C6.address 195.154.122.54 -64E99CB34C595A02A3165484BD1215E7389322C6.or_port 443 -64E99CB34C595A02A3165484BD1215E7389322C6.dir_port 80 68F175CCABE727AA2D2309BCD8789499CEE36ED7.address 163.172.139.104 68F175CCABE727AA2D2309BCD8789499CEE36ED7.or_port 443 68F175CCABE727AA2D2309BCD8789499CEE36ED7.dir_port 8080 6A7551EEE18F78A9813096E82BF84F740D32B911.address 85.214.62.48 6A7551EEE18F78A9813096E82BF84F740D32B911.or_port 443 6A7551EEE18F78A9813096E82BF84F740D32B911.dir_port 80 -6B697F3FF04C26123466A5C0E5D1F8D91925967A.address 95.130.11.147 -6B697F3FF04C26123466A5C0E5D1F8D91925967A.or_port 443 -6B697F3FF04C26123466A5C0E5D1F8D91925967A.dir_port 9030 -6DE61A6F72C1E5418A66BFED80DFB63E4C77668F.address 91.121.84.137 -6DE61A6F72C1E5418A66BFED80DFB63E4C77668F.or_port 4051 -6DE61A6F72C1E5418A66BFED80DFB63E4C77668F.dir_port 4951 -6DE61A6F72C1E5418A66BFED80DFB63E4C77668F.orport6_address 2001:41d0:1:8989::1 -6DE61A6F72C1E5418A66BFED80DFB63E4C77668F.orport6_port 4051 -6E44A52E3D1FF7683FE5C399C3FB5E912DE1C6B4.address 213.61.66.117 -6E44A52E3D1FF7683FE5C399C3FB5E912DE1C6B4.or_port 9002 -6E44A52E3D1FF7683FE5C399C3FB5E912DE1C6B4.dir_port 9032 6EF897645B79B6CB35E853B32506375014DE3621.address 80.127.137.19 6EF897645B79B6CB35E853B32506375014DE3621.or_port 443 6EF897645B79B6CB35E853B32506375014DE3621.dir_port 80 @@ -258,17 +223,20 @@ stem_commit 84ef872f52932cb4e5b19f0358d24c44347c1fa3 7187CED1A3871F837D0E60AC98F374AC541CB0DA.address 95.183.48.12 7187CED1A3871F837D0E60AC98F374AC541CB0DA.or_port 443 7187CED1A3871F837D0E60AC98F374AC541CB0DA.dir_port 80 -71AB4726D830FAE776D74AEF790CF04D8E0151B4.address 163.172.35.247 -71AB4726D830FAE776D74AEF790CF04D8E0151B4.or_port 443 -71AB4726D830FAE776D74AEF790CF04D8E0151B4.dir_port 80 +722D365140C8C52DBB3C9FF6986E3CEFFE2BA812.address 85.214.151.72 +722D365140C8C52DBB3C9FF6986E3CEFFE2BA812.or_port 9001 +722D365140C8C52DBB3C9FF6986E3CEFFE2BA812.dir_port 9030 72B2B12A3F60408BDBC98C6DF53988D3A0B3F0EE.address 85.235.250.88 72B2B12A3F60408BDBC98C6DF53988D3A0B3F0EE.or_port 443 72B2B12A3F60408BDBC98C6DF53988D3A0B3F0EE.dir_port 80 -75F1992FD3F403E9C082A5815EB5D12934CDF46C.address 46.101.237.246 -75F1992FD3F403E9C082A5815EB5D12934CDF46C.or_port 9001 -75F1992FD3F403E9C082A5815EB5D12934CDF46C.dir_port 9030 -75F1992FD3F403E9C082A5815EB5D12934CDF46C.orport6_address 2a03:b0c0:3:d0::208:5001 -75F1992FD3F403E9C082A5815EB5D12934CDF46C.orport6_port 9050 +7350AB9ED7568F22745198359373C04AC783C37C.address 176.31.191.26 +7350AB9ED7568F22745198359373C04AC783C37C.or_port 443 +7350AB9ED7568F22745198359373C04AC783C37C.dir_port 80 +763C9556602BD6207771A7A3D958091D44C43228.address 134.119.36.135 +763C9556602BD6207771A7A3D958091D44C43228.or_port 443 +763C9556602BD6207771A7A3D958091D44C43228.dir_port 80 +763C9556602BD6207771A7A3D958091D44C43228.orport6_address 2a00:1158:3::2a8 +763C9556602BD6207771A7A3D958091D44C43228.orport6_port 993 774555642FDC1E1D4FDF2E0C31B7CA9501C5C9C7.address 188.166.133.133 774555642FDC1E1D4FDF2E0C31B7CA9501C5C9C7.or_port 9001 774555642FDC1E1D4FDF2E0C31B7CA9501C5C9C7.dir_port 9030 @@ -279,15 +247,9 @@ stem_commit 84ef872f52932cb4e5b19f0358d24c44347c1fa3 789EA6C9AE9ADDD8760903171CFA9AC5741B0C70.dir_port 9030 789EA6C9AE9ADDD8760903171CFA9AC5741B0C70.orport6_address 2001:4ba0:cafe:e84::1 789EA6C9AE9ADDD8760903171CFA9AC5741B0C70.orport6_port 9001 -794D8EA8343A4E820320265D05D4FA83AB6D1778.address 185.11.180.67 -794D8EA8343A4E820320265D05D4FA83AB6D1778.or_port 9001 -794D8EA8343A4E820320265D05D4FA83AB6D1778.dir_port 80 79861CF8522FC637EF046F7688F5289E49D94576.address 171.25.193.131 79861CF8522FC637EF046F7688F5289E49D94576.or_port 443 79861CF8522FC637EF046F7688F5289E49D94576.dir_port 80 -79E169B25E4C7CE99584F6ED06F379478F23E2B8.address 62.210.129.246 -79E169B25E4C7CE99584F6ED06F379478F23E2B8.or_port 443 -79E169B25E4C7CE99584F6ED06F379478F23E2B8.dir_port 80 7A32C9519D80CA458FC8B034A28F5F6815649A98.address 82.223.21.74 7A32C9519D80CA458FC8B034A28F5F6815649A98.or_port 9001 7A32C9519D80CA458FC8B034A28F5F6815649A98.dir_port 9030 @@ -307,11 +269,6 @@ stem_commit 84ef872f52932cb4e5b19f0358d24c44347c1fa3 844AE9CAD04325E955E2BE1521563B79FE7094B7.address 192.87.28.82 844AE9CAD04325E955E2BE1521563B79FE7094B7.or_port 9001 844AE9CAD04325E955E2BE1521563B79FE7094B7.dir_port 9030 -8664DC892540F3C789DB37008236C096C871734D.address 163.172.138.22 -8664DC892540F3C789DB37008236C096C871734D.or_port 443 -8664DC892540F3C789DB37008236C096C871734D.dir_port 80 -8664DC892540F3C789DB37008236C096C871734D.orport6_address 2001:bc8:4400:2100::1:3 -8664DC892540F3C789DB37008236C096C871734D.orport6_port 443 8672E8A01B4D3FA4C0BBE21C740D4506302EA487.address 188.166.23.127 8672E8A01B4D3FA4C0BBE21C740D4506302EA487.or_port 443 8672E8A01B4D3FA4C0BBE21C740D4506302EA487.dir_port 80 @@ -326,6 +283,8 @@ stem_commit 84ef872f52932cb4e5b19f0358d24c44347c1fa3 8C00FA7369A7A308F6A137600F0FA07990D9D451.address 163.172.194.53 8C00FA7369A7A308F6A137600F0FA07990D9D451.or_port 9001 8C00FA7369A7A308F6A137600F0FA07990D9D451.dir_port 9030 +8C00FA7369A7A308F6A137600F0FA07990D9D451.orport6_address 2001:bc8:225f:142:6c69:7461:7669:73 +8C00FA7369A7A308F6A137600F0FA07990D9D451.orport6_port 9001 8FA37B93397015B2BC5A525C908485260BE9F422.address 178.254.44.135 8FA37B93397015B2BC5A525C908485260BE9F422.or_port 9001 8FA37B93397015B2BC5A525C908485260BE9F422.dir_port 9030 @@ -351,15 +310,6 @@ stem_commit 84ef872f52932cb4e5b19f0358d24c44347c1fa3 94C4B7B8C50C86A92B6A20107539EE2678CF9A28.address 204.8.156.142 94C4B7B8C50C86A92B6A20107539EE2678CF9A28.or_port 443 94C4B7B8C50C86A92B6A20107539EE2678CF9A28.dir_port 80 -95DA61AEF23A6C851028C1AA88AD8593F659E60F.address 176.10.104.243 -95DA61AEF23A6C851028C1AA88AD8593F659E60F.or_port 8443 -95DA61AEF23A6C851028C1AA88AD8593F659E60F.dir_port 8080 -971AFB23C168DCD8EDA17473C1C452B359DE3A5A.address 85.10.202.87 -971AFB23C168DCD8EDA17473C1C452B359DE3A5A.or_port 9001 -971AFB23C168DCD8EDA17473C1C452B359DE3A5A.dir_port 9030 -98F8D5F359949E41DE8DF3DBB1975A86E96A84A0.address 85.214.206.219 -98F8D5F359949E41DE8DF3DBB1975A86E96A84A0.or_port 9001 -98F8D5F359949E41DE8DF3DBB1975A86E96A84A0.dir_port 9030 998BF3ED7F70E33D1C307247B9626D9E7573C438.address 163.172.223.200 998BF3ED7F70E33D1C307247B9626D9E7573C438.or_port 443 998BF3ED7F70E33D1C307247B9626D9E7573C438.dir_port 80 @@ -372,24 +322,28 @@ stem_commit 84ef872f52932cb4e5b19f0358d24c44347c1fa3 9A68B85A02318F4E7E87F2828039FBD5D75B0142.address 66.111.2.20 9A68B85A02318F4E7E87F2828039FBD5D75B0142.or_port 9001 9A68B85A02318F4E7E87F2828039FBD5D75B0142.dir_port 9030 -9B1F5187DFBA89DC24B37EA7BF896C12B43A27AE.address 5.35.251.247 -9B1F5187DFBA89DC24B37EA7BF896C12B43A27AE.or_port 9001 -9B1F5187DFBA89DC24B37EA7BF896C12B43A27AE.dir_port 9030 +9B31F1F1C1554F9FFB3455911F82E818EF7C7883.address 185.100.86.128 +9B31F1F1C1554F9FFB3455911F82E818EF7C7883.or_port 9001 +9B31F1F1C1554F9FFB3455911F82E818EF7C7883.dir_port 9030 9BF04559224F0F1C3C953D641F1744AF0192543A.address 5.9.151.241 9BF04559224F0F1C3C953D641F1744AF0192543A.or_port 4223 9BF04559224F0F1C3C953D641F1744AF0192543A.dir_port 9030 +9BF04559224F0F1C3C953D641F1744AF0192543A.orport6_address 2a01:4f8:190:34f0::2 +9BF04559224F0F1C3C953D641F1744AF0192543A.orport6_port 4223 9C900A7F6F5DD034CFFD192DAEC9CCAA813DB022.address 86.105.212.130 9C900A7F6F5DD034CFFD192DAEC9CCAA813DB022.or_port 443 9C900A7F6F5DD034CFFD192DAEC9CCAA813DB022.dir_port 9030 -9EC5E097663862DF861A18C32B37C5F82284B27D.address 146.185.177.103 -9EC5E097663862DF861A18C32B37C5F82284B27D.or_port 9030 -9EC5E097663862DF861A18C32B37C5F82284B27D.dir_port 80 9F5068310818ED7C70B0BC4087AB55CB12CB4377.address 178.254.20.134 9F5068310818ED7C70B0BC4087AB55CB12CB4377.or_port 443 9F5068310818ED7C70B0BC4087AB55CB12CB4377.dir_port 80 9F7D6E6420183C2B76D3CE99624EBC98A21A967E.address 46.28.110.244 9F7D6E6420183C2B76D3CE99624EBC98A21A967E.or_port 443 9F7D6E6420183C2B76D3CE99624EBC98A21A967E.dir_port 80 +9FBEB75E8BC142565F12CBBE078D63310236A334.address 91.121.84.137 +9FBEB75E8BC142565F12CBBE078D63310236A334.or_port 4052 +9FBEB75E8BC142565F12CBBE078D63310236A334.dir_port 4952 +9FBEB75E8BC142565F12CBBE078D63310236A334.orport6_address 2001:41d0:1:8989::1 +9FBEB75E8BC142565F12CBBE078D63310236A334.orport6_port 4052 A0766C0D3A667A3232C7D569DE94A28F9922FCB1.address 178.62.22.36 A0766C0D3A667A3232C7D569DE94A28F9922FCB1.or_port 443 A0766C0D3A667A3232C7D569DE94A28F9922FCB1.dir_port 80 @@ -405,23 +359,15 @@ A478E421F83194C114F41E94F95999672AED51FE.or_port 443 A478E421F83194C114F41E94F95999672AED51FE.dir_port 80 A478E421F83194C114F41E94F95999672AED51FE.orport6_address 2001:67c:289c:3::78 A478E421F83194C114F41E94F95999672AED51FE.orport6_port 443 -A4C98CEA3F34E05299417E9F885A642C88EF6029.address 178.16.208.58 -A4C98CEA3F34E05299417E9F885A642C88EF6029.or_port 443 -A4C98CEA3F34E05299417E9F885A642C88EF6029.dir_port 80 -A4C98CEA3F34E05299417E9F885A642C88EF6029.orport6_address 2a00:1c20:4089:1234:cdae:1b3e:cc38:3d45 -A4C98CEA3F34E05299417E9F885A642C88EF6029.orport6_port 443 A9406A006D6E7B5DA30F2C6D4E42A338B5E340B2.address 163.172.149.122 A9406A006D6E7B5DA30F2C6D4E42A338B5E340B2.or_port 443 A9406A006D6E7B5DA30F2C6D4E42A338B5E340B2.dir_port 80 -A9DEB920B42B4EC1DE6249034039B06D61F38690.address 213.61.66.116 -A9DEB920B42B4EC1DE6249034039B06D61F38690.or_port 9003 -A9DEB920B42B4EC1DE6249034039B06D61F38690.dir_port 9033 ABCB4965F1FEE193602B50A365425105C889D3F8.address 192.34.63.137 ABCB4965F1FEE193602B50A365425105C889D3F8.or_port 443 ABCB4965F1FEE193602B50A365425105C889D3F8.dir_port 9030 -AC66FFA4AB35A59EBBF5BF4C70008BF24D8A7A5C.address 195.154.164.243 -AC66FFA4AB35A59EBBF5BF4C70008BF24D8A7A5C.or_port 443 -AC66FFA4AB35A59EBBF5BF4C70008BF24D8A7A5C.dir_port 80 +ABF7FBF389C9A747938B639B20E80620B460B2A9.address 109.163.234.9 +ABF7FBF389C9A747938B639B20E80620B460B2A9.or_port 443 +ABF7FBF389C9A747938B639B20E80620B460B2A9.dir_port 80 ACD889D86E02EDDAB1AFD81F598C0936238DC6D0.address 86.59.119.88 ACD889D86E02EDDAB1AFD81F598C0936238DC6D0.or_port 443 ACD889D86E02EDDAB1AFD81F598C0936238DC6D0.dir_port 80 @@ -430,17 +376,11 @@ ACDD9E85A05B127BA010466C13C8C47212E8A38F.or_port 9001 ACDD9E85A05B127BA010466C13C8C47212E8A38F.dir_port 9030 ACDD9E85A05B127BA010466C13C8C47212E8A38F.orport6_address 2a06:d380:0:3700::62 ACDD9E85A05B127BA010466C13C8C47212E8A38F.orport6_port 9001 -AD19490C7DBB26D3A68EFC824F67E69B0A96E601.address 188.40.128.246 -AD19490C7DBB26D3A68EFC824F67E69B0A96E601.or_port 9001 -AD19490C7DBB26D3A68EFC824F67E69B0A96E601.dir_port 9030 AD253B49E303C6AB1E048B014392AC569E8A7DAE.address 163.172.131.88 AD253B49E303C6AB1E048B014392AC569E8A7DAE.or_port 443 AD253B49E303C6AB1E048B014392AC569E8A7DAE.dir_port 80 AD253B49E303C6AB1E048B014392AC569E8A7DAE.orport6_address 2001:bc8:4400:2100::2:1009 AD253B49E303C6AB1E048B014392AC569E8A7DAE.orport6_port 443 -AD86CD1A49573D52A7B6F4A35750F161AAD89C88.address 176.10.104.240 -AD86CD1A49573D52A7B6F4A35750F161AAD89C88.or_port 8443 -AD86CD1A49573D52A7B6F4A35750F161AAD89C88.dir_port 8080 ADB2C26629643DBB9F8FE0096E7D16F9414B4F8D.address 31.185.104.20 ADB2C26629643DBB9F8FE0096E7D16F9414B4F8D.or_port 443 ADB2C26629643DBB9F8FE0096E7D16F9414B4F8D.dir_port 80 @@ -449,17 +389,15 @@ AEA43CB1E47BE5F8051711B2BF01683DB1568E05.or_port 443 AEA43CB1E47BE5F8051711B2BF01683DB1568E05.dir_port 80 AEA43CB1E47BE5F8051711B2BF01683DB1568E05.orport6_address 2001:41d0:a:74a::1 AEA43CB1E47BE5F8051711B2BF01683DB1568E05.orport6_port 443 -B0279A521375F3CB2AE210BDBFC645FDD2E1973A.address 176.126.252.11 -B0279A521375F3CB2AE210BDBFC645FDD2E1973A.or_port 9001 -B0279A521375F3CB2AE210BDBFC645FDD2E1973A.dir_port 443 -B0279A521375F3CB2AE210BDBFC645FDD2E1973A.orport6_address 2a02:59e0:0:7::11 -B0279A521375F3CB2AE210BDBFC645FDD2E1973A.orport6_port 9003 +AF322D83A4D2048B22F7F1AF5F38AFF4D09D0B76.address 46.28.205.170 +AF322D83A4D2048B22F7F1AF5F38AFF4D09D0B76.or_port 443 +AF322D83A4D2048B22F7F1AF5F38AFF4D09D0B76.dir_port 80 +B0553175AADB0501E5A61FC61CEA3970BE130FF2.address 5.9.147.226 +B0553175AADB0501E5A61FC61CEA3970BE130FF2.or_port 9001 +B0553175AADB0501E5A61FC61CEA3970BE130FF2.dir_port 9030 B143D439B72D239A419F8DCE07B8A8EB1B486FA7.address 212.129.62.232 B143D439B72D239A419F8DCE07B8A8EB1B486FA7.or_port 443 B143D439B72D239A419F8DCE07B8A8EB1B486FA7.dir_port 80 -B1726B94885CE3AC3910CA8B60622B97B98E2529.address 185.66.250.141 -B1726B94885CE3AC3910CA8B60622B97B98E2529.or_port 9001 -B1726B94885CE3AC3910CA8B60622B97B98E2529.dir_port 9030 B1D81825CFD7209BD1B4520B040EF5653C204A23.address 198.199.64.217 B1D81825CFD7209BD1B4520B040EF5653C204A23.or_port 443 B1D81825CFD7209BD1B4520B040EF5653C204A23.dir_port 80 @@ -468,9 +406,11 @@ B1D81825CFD7209BD1B4520B040EF5653C204A23.orport6_port 9050 B291D30517D23299AD7CEE3E60DFE60D0E3A4664.address 136.243.214.137 B291D30517D23299AD7CEE3E60DFE60D0E3A4664.or_port 443 B291D30517D23299AD7CEE3E60DFE60D0E3A4664.dir_port 80 -B4CAFD9CBFB34EC5DAAC146920DC7DFAFE91EA20.address 212.47.233.86 -B4CAFD9CBFB34EC5DAAC146920DC7DFAFE91EA20.or_port 9001 -B4CAFD9CBFB34EC5DAAC146920DC7DFAFE91EA20.dir_port 9030 +B44FBE5366AD98B46D829754FA4AC599BAE41A6A.address 178.16.208.60 +B44FBE5366AD98B46D829754FA4AC599BAE41A6A.or_port 443 +B44FBE5366AD98B46D829754FA4AC599BAE41A6A.dir_port 80 +B44FBE5366AD98B46D829754FA4AC599BAE41A6A.orport6_address 2a00:1c20:4089:1234:67bc:79f3:61c0:6e49 +B44FBE5366AD98B46D829754FA4AC599BAE41A6A.orport6_port 443 B5212DB685A2A0FCFBAE425738E478D12361710D.address 93.115.97.242 B5212DB685A2A0FCFBAE425738E478D12361710D.or_port 9001 B5212DB685A2A0FCFBAE425738E478D12361710D.dir_port 9030 @@ -487,12 +427,11 @@ B84F248233FEA90CAD439F292556A3139F6E1B82.or_port 9002 B84F248233FEA90CAD439F292556A3139F6E1B82.dir_port 444 B84F248233FEA90CAD439F292556A3139F6E1B82.orport6_address 2a00:1298:8011:212::164 B84F248233FEA90CAD439F292556A3139F6E1B82.orport6_port 9004 -BC630CBBB518BE7E9F4E09712AB0269E9DC7D626.address 197.231.221.211 -BC630CBBB518BE7E9F4E09712AB0269E9DC7D626.or_port 9001 -BC630CBBB518BE7E9F4E09712AB0269E9DC7D626.dir_port 9030 BC7ACFAC04854C77167C7D66B7E471314ED8C410.address 89.163.247.43 BC7ACFAC04854C77167C7D66B7E471314ED8C410.or_port 9001 BC7ACFAC04854C77167C7D66B7E471314ED8C410.dir_port 9030 +BC7ACFAC04854C77167C7D66B7E471314ED8C410.orport6_address 2001:4ba0:fff7:25::5 +BC7ACFAC04854C77167C7D66B7E471314ED8C410.orport6_port 9001 BCEDF6C193AA687AE471B8A22EBF6BC57C2D285E.address 198.96.155.3 BCEDF6C193AA687AE471B8A22EBF6BC57C2D285E.or_port 5001 BCEDF6C193AA687AE471B8A22EBF6BC57C2D285E.dir_port 8080 @@ -501,14 +440,6 @@ BCEF908195805E03E92CCFE669C48738E556B9C5.or_port 9001 BCEF908195805E03E92CCFE669C48738E556B9C5.dir_port 9030 BCEF908195805E03E92CCFE669C48738E556B9C5.orport6_address 2a03:b0c0:2:d0::158:3001 BCEF908195805E03E92CCFE669C48738E556B9C5.orport6_port 9001 -BF0FB582E37F738CD33C3651125F2772705BB8E8.address 148.251.190.229 -BF0FB582E37F738CD33C3651125F2772705BB8E8.or_port 9010 -BF0FB582E37F738CD33C3651125F2772705BB8E8.dir_port 9030 -BF0FB582E37F738CD33C3651125F2772705BB8E8.orport6_address 2a01:4f8:211:c68::2 -BF0FB582E37F738CD33C3651125F2772705BB8E8.orport6_port 9010 -C08DE49658E5B3CFC6F2A952B453C4B608C9A16A.address 163.172.35.249 -C08DE49658E5B3CFC6F2A952B453C4B608C9A16A.or_port 443 -C08DE49658E5B3CFC6F2A952B453C4B608C9A16A.dir_port 80 C13B91384CDD52A871E3ECECE4EF74A7AC7DCB08.address 185.35.202.221 C13B91384CDD52A871E3ECECE4EF74A7AC7DCB08.or_port 9001 C13B91384CDD52A871E3ECECE4EF74A7AC7DCB08.dir_port 9030 @@ -522,9 +453,11 @@ C37BC191AC389179674578C3E6944E925FE186C2.orport6_port 1337 C414F28FD2BEC1553024299B31D4E726BEB8E788.address 188.138.112.60 C414F28FD2BEC1553024299B31D4E726BEB8E788.or_port 1521 C414F28FD2BEC1553024299B31D4E726BEB8E788.dir_port 1433 -CBD0D1BD110EC52963082D839AC6A89D0AE243E7.address 37.59.46.159 -CBD0D1BD110EC52963082D839AC6A89D0AE243E7.or_port 9001 -CBD0D1BD110EC52963082D839AC6A89D0AE243E7.dir_port 9030 +C793AB88565DDD3C9E4C6F15CCB9D8C7EF964CE9.address 85.248.227.163 +C793AB88565DDD3C9E4C6F15CCB9D8C7EF964CE9.or_port 9001 +C793AB88565DDD3C9E4C6F15CCB9D8C7EF964CE9.dir_port 443 +C793AB88565DDD3C9E4C6F15CCB9D8C7EF964CE9.orport6_address 2a00:1298:8011:212::163 +C793AB88565DDD3C9E4C6F15CCB9D8C7EF964CE9.orport6_port 9003 CBEFF7BA4A4062045133C053F2D70524D8BBE5BE.address 178.62.199.226 CBEFF7BA4A4062045133C053F2D70524D8BBE5BE.or_port 443 CBEFF7BA4A4062045133C053F2D70524D8BBE5BE.dir_port 80 @@ -533,12 +466,18 @@ CBEFF7BA4A4062045133C053F2D70524D8BBE5BE.orport6_port 443 D1B8AAA98C65F3DF7D8BB3AF881CAEB84A33D8EE.address 134.119.3.164 D1B8AAA98C65F3DF7D8BB3AF881CAEB84A33D8EE.or_port 9001 D1B8AAA98C65F3DF7D8BB3AF881CAEB84A33D8EE.dir_port 9030 -D2A1703758A0FBBA026988B92C2F88BAB59F9361.address 185.13.38.75 -D2A1703758A0FBBA026988B92C2F88BAB59F9361.or_port 9001 -D2A1703758A0FBBA026988B92C2F88BAB59F9361.dir_port 9030 -D64366987CB39F61AD21DBCF8142FA0577B92811.address 37.221.162.226 -D64366987CB39F61AD21DBCF8142FA0577B92811.or_port 9001 -D64366987CB39F61AD21DBCF8142FA0577B92811.dir_port 9030 +D3E5EDDBE5159388704D6785BE51930AAFACEC6F.address 31.171.155.108 +D3E5EDDBE5159388704D6785BE51930AAFACEC6F.or_port 9001 +D3E5EDDBE5159388704D6785BE51930AAFACEC6F.dir_port 9030 +D5039E1EBFD96D9A3F9846BF99EC9F75EDDE902A.address 37.187.115.157 +D5039E1EBFD96D9A3F9846BF99EC9F75EDDE902A.or_port 9001 +D5039E1EBFD96D9A3F9846BF99EC9F75EDDE902A.dir_port 9030 +D5C33F3E203728EDF8361EA868B2939CCC43FAFB.address 166.82.21.200 +D5C33F3E203728EDF8361EA868B2939CCC43FAFB.or_port 9029 +D5C33F3E203728EDF8361EA868B2939CCC43FAFB.dir_port 9030 +D62FB817B0288085FAC38A6DC8B36DCD85B70260.address 185.14.185.240 +D62FB817B0288085FAC38A6DC8B36DCD85B70260.or_port 443 +D62FB817B0288085FAC38A6DC8B36DCD85B70260.dir_port 9030 D760C5B436E42F93D77EF2D969157EEA14F9B39C.address 46.101.169.151 D760C5B436E42F93D77EF2D969157EEA14F9B39C.or_port 9001 D760C5B436E42F93D77EF2D969157EEA14F9B39C.dir_port 9030 @@ -560,51 +499,38 @@ DD85503F2D1F52EF9EAD621E942298F46CD2FC10.or_port 9001 DD85503F2D1F52EF9EAD621E942298F46CD2FC10.dir_port 9030 DD85503F2D1F52EF9EAD621E942298F46CD2FC10.orport6_address 2a03:b0c0:0:1010::a4:b001 DD85503F2D1F52EF9EAD621E942298F46CD2FC10.orport6_port 9001 -DDBB2A38252ADDA53E4492DDF982CA6CC6E10EC0.address 83.212.99.68 -DDBB2A38252ADDA53E4492DDF982CA6CC6E10EC0.or_port 443 -DDBB2A38252ADDA53E4492DDF982CA6CC6E10EC0.dir_port 80 -DDBB2A38252ADDA53E4492DDF982CA6CC6E10EC0.orport6_address 2001:648:2ffc:1225:a800:bff:fe3d:67b5 -DDBB2A38252ADDA53E4492DDF982CA6CC6E10EC0.orport6_port 443 DDD7871C1B7FA32CB55061E08869A236E61BDDF8.address 5.34.183.205 DDD7871C1B7FA32CB55061E08869A236E61BDDF8.or_port 443 DDD7871C1B7FA32CB55061E08869A236E61BDDF8.dir_port 80 -DE6CD5F09DF26076F26321B0BDFBE78ACD935C65.address 167.114.66.61 -DE6CD5F09DF26076F26321B0BDFBE78ACD935C65.or_port 443 -DE6CD5F09DF26076F26321B0BDFBE78ACD935C65.dir_port 9696 -DE6CD5F09DF26076F26321B0BDFBE78ACD935C65.orport6_address 2607:5300:100::78d -DE6CD5F09DF26076F26321B0BDFBE78ACD935C65.orport6_port 443 DEB73705B2929AE9BE87091607388939332EF123.address 78.24.75.53 DEB73705B2929AE9BE87091607388939332EF123.or_port 9001 DEB73705B2929AE9BE87091607388939332EF123.dir_port 9030 DED6892FF89DBD737BA689698A171B2392EB3E82.address 92.222.38.67 DED6892FF89DBD737BA689698A171B2392EB3E82.or_port 443 DED6892FF89DBD737BA689698A171B2392EB3E82.dir_port 80 -DF3AED4322B1824BF5539AE54B2D1B38E080FF05.address 217.12.199.208 -DF3AED4322B1824BF5539AE54B2D1B38E080FF05.or_port 443 -DF3AED4322B1824BF5539AE54B2D1B38E080FF05.dir_port 80 -DF3AED4322B1824BF5539AE54B2D1B38E080FF05.orport6_address 2a02:27a8:0:2::7e -DF3AED4322B1824BF5539AE54B2D1B38E080FF05.orport6_port 443 +E3DB2E354B883B59E8DC56B3E7A353DDFD457812.address 166.70.207.2 +E3DB2E354B883B59E8DC56B3E7A353DDFD457812.or_port 9001 +E3DB2E354B883B59E8DC56B3E7A353DDFD457812.dir_port 9030 +E589316576A399C511A9781A73DA4545640B479D.address 46.252.26.2 +E589316576A399C511A9781A73DA4545640B479D.or_port 49991 +E589316576A399C511A9781A73DA4545640B479D.dir_port 45212 E65D300F11E1DB12C534B0146BDAB6972F1A8A48.address 167.114.35.28 E65D300F11E1DB12C534B0146BDAB6972F1A8A48.or_port 9001 E65D300F11E1DB12C534B0146BDAB6972F1A8A48.dir_port 9030 -E81EF60A73B3809F8964F73766B01BAA0A171E20.address 212.47.244.38 -E81EF60A73B3809F8964F73766B01BAA0A171E20.or_port 443 -E81EF60A73B3809F8964F73766B01BAA0A171E20.dir_port 8080 EBE718E1A49EE229071702964F8DB1F318075FF8.address 131.188.40.188 EBE718E1A49EE229071702964F8DB1F318075FF8.or_port 80 EBE718E1A49EE229071702964F8DB1F318075FF8.dir_port 443 -EC639EDAA5121B47DBDF3D6B01A22E48A8CB6CC7.address 89.40.71.149 -EC639EDAA5121B47DBDF3D6B01A22E48A8CB6CC7.or_port 8080 -EC639EDAA5121B47DBDF3D6B01A22E48A8CB6CC7.dir_port 8081 ED2338CAC2711B3E331392E1ED2831219B794024.address 192.87.28.28 ED2338CAC2711B3E331392E1ED2831219B794024.or_port 9001 ED2338CAC2711B3E331392E1ED2831219B794024.dir_port 9030 -F409FA7902FD89270E8DE0D7977EA23BC38E5887.address 212.83.40.238 -F409FA7902FD89270E8DE0D7977EA23BC38E5887.or_port 9001 -F409FA7902FD89270E8DE0D7977EA23BC38E5887.dir_port 9030 -F4C0EDAA0BF0F7EC138746F8FEF1CE26C7860265.address 5.199.142.236 -F4C0EDAA0BF0F7EC138746F8FEF1CE26C7860265.or_port 9001 -F4C0EDAA0BF0F7EC138746F8FEF1CE26C7860265.dir_port 9030 +F10BDE279AE71515DDCCCC61DC19AC8765F8A3CC.address 192.99.212.139 +F10BDE279AE71515DDCCCC61DC19AC8765F8A3CC.or_port 443 +F10BDE279AE71515DDCCCC61DC19AC8765F8A3CC.dir_port 80 +F406219CDD339026D160E53FCA0EF6857C70F109.address 212.238.208.48 +F406219CDD339026D160E53FCA0EF6857C70F109.or_port 9001 +F406219CDD339026D160E53FCA0EF6857C70F109.dir_port 9030 +F406219CDD339026D160E53FCA0EF6857C70F109.orport6_address 2001:984:a8fb:1:ba27:ebff:feac:c109 +F406219CDD339026D160E53FCA0EF6857C70F109.orport6_port 9001 F69BED36177ED727706512BA6A97755025EEA0FB.address 46.28.207.141 F69BED36177ED727706512BA6A97755025EEA0FB.or_port 443 F69BED36177ED727706512BA6A97755025EEA0FB.dir_port 80 @@ -617,18 +543,12 @@ F9246DEF2B653807236DA134F2AEAB103D58ABFE.dir_port 80 F93D8F37E35C390BCAD9F9069E13085B745EC216.address 185.96.180.29 F93D8F37E35C390BCAD9F9069E13085B745EC216.or_port 443 F93D8F37E35C390BCAD9F9069E13085B745EC216.dir_port 80 -FA3415659444AE006E7E9E5375E82F29700CFDFD.address 104.243.35.196 -FA3415659444AE006E7E9E5375E82F29700CFDFD.or_port 9001 -FA3415659444AE006E7E9E5375E82F29700CFDFD.dir_port 9030 FC9AC8EA0160D88BCCFDE066940D7DD9FA45495B.address 86.59.119.83 FC9AC8EA0160D88BCCFDE066940D7DD9FA45495B.or_port 443 FC9AC8EA0160D88BCCFDE066940D7DD9FA45495B.dir_port 80 FD1871854BFC06D7B02F10742073069F0528B5CC.address 192.187.124.98 FD1871854BFC06D7B02F10742073069F0528B5CC.or_port 9001 FD1871854BFC06D7B02F10742073069F0528B5CC.dir_port 9030 -FDF845FC159C0020E2BDDA120C30C5C5038F74B4.address 212.129.38.254 -FDF845FC159C0020E2BDDA120C30C5C5038F74B4.or_port 9001 -FDF845FC159C0020E2BDDA120C30C5C5038F74B4.dir_port 9030 FE296180018833AF03A8EACD5894A614623D3F76.address 149.56.45.200 FE296180018833AF03A8EACD5894A614623D3F76.or_port 9001 FE296180018833AF03A8EACD5894A614623D3F76.dir_port 9030 diff --git a/stem/settings.cfg b/stem/settings.cfg index ec57bd9..9db455a 100644 --- a/stem/settings.cfg +++ b/stem/settings.cfg @@ -105,7 +105,6 @@ manual.summary.OutboundBindAddressOR Make outbound non-exit connections originat manual.summary.OutboundBindAddressExit Make outbound exit connections originate from this address manual.summary.PidFile Path for a file tor writes containing its process id manual.summary.ProtocolWarnings Toggles if protocol errors give warnings or not -manual.summary.PredictedPortsRelevanceTime Duration to ensure circuits for previously used ports remain available manual.summary.RunAsDaemon Toggles if tor runs as a daemon process manual.summary.LogTimeGranularity limits granularity of log message timestamps manual.summary.TruncateLogFile Overwrites log file rather than appending when restarted @@ -127,7 +126,6 @@ manual.summary.Bridge Available bridges manual.summary.LearnCircuitBuildTimeout Toggles adaptive timeouts for circuit creation manual.summary.CircuitBuildTimeout Initial timeout for circuit creation manual.summary.CircuitsAvailableTimeout Time to keep circuits open and unused for -manual.summary.CircuitIdleTimeout Timeout for closing circuits that have never been used manual.summary.CircuitStreamTimeout Timeout for shifting streams among circuits manual.summary.ClientOnly Ensures that we aren't used as a relay or directory mirror manual.summary.ConnectionPadding Pad traffic to help prevent correlation attacks

1 0

[stem/master] Regression when tor_cmd isn't a path
by atagar＠torproject.org 24 May '17

24 May '17

commit 5c2c55012aea1175855d485800587ca5a2cc8aed Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 24 13:34:59 2017 -0700 Regression when tor_cmd isn't a path Stupid me. By default tor_cmd is just 'tor' so resolving that to an absolute path breaks. If presented with a path we want to expand it. If not then we should rely on our PATH. --- test/runner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/runner.py b/test/runner.py index bbaa4aa..9430e82 100644 --- a/test/runner.py +++ b/test/runner.py @@ -197,7 +197,7 @@ class Runner(object): self._test_dir = tempfile.mktemp('-stem-integ') original_cwd, data_dir_path = os.getcwd(), self._test_dir - self._tor_cmd = os.path.abspath(tor_cmd) + self._tor_cmd = stem.util.system.expand_path(tor_cmd) if '/' in tor_cmd else tor_cmd if test.Target.RELATIVE in self.attribute_targets: tor_cwd = os.path.dirname(self._test_dir)

1 0

[stem/master] Add cwd argument to stem.util.system.call()
by atagar＠torproject.org 24 May '17

24 May '17

commit dfcdc18526ee416302ea7fed780478a3fd08e0ae Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 24 13:26:14 2017 -0700 Add cwd argument to stem.util.system.call() While investigating #22366 I ran into rare failures with relative paths. On reflection this is likely due to a background thread calling chdir. We shouldn't change global state in the background. The subprocess accepts a cwd argument so taking advantage of that. --- docs/change_log.rst | 1 + stem/util/system.py | 6 +++--- test/integ/installation.py | 35 +++++++++++++++-------------------- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index c9b96af..a097f5d 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -66,6 +66,7 @@ The following are only available within Stem's `git repository * **Utilities** * Added timeout argument to :func:`~stem.util.system.call` + * Added cwd argument to :func:`~stem.util.system.call` * Added :class:`~stem.util.test_tools.TimedTestRunner` and :func:`~stem.util.test_tools.test_runtimes` * **Interpreter** diff --git a/stem/util/system.py b/stem/util/system.py index 7b31516..9f85304 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -1036,7 +1036,7 @@ def files_with_suffix(base_path, suffix): yield os.path.join(root, filename) -def call(command, default = UNDEFINED, ignore_exit_status = False, timeout = None, env = None): +def call(command, default = UNDEFINED, ignore_exit_status = False, timeout = None, cwd = None, env = None): """ call(command, default = UNDEFINED, ignore_exit_status = False) @@ -1052,7 +1052,7 @@ def call(command, default = UNDEFINED, ignore_exit_status = False, timeout = Non Added env argument. .. versionchanged:: 1.6.0 - Added timeout argument. + Added timeout and cwd arguments. :param str,list command: command to be issued :param object default: response if the query fails @@ -1082,7 +1082,7 @@ def call(command, default = UNDEFINED, ignore_exit_status = False, timeout = Non try: is_shell_command = command_list[0] in SHELL_COMMANDS - process = subprocess.Popen(command_list, stdout = subprocess.PIPE, stderr = subprocess.PIPE, shell = is_shell_command, env = env) + process = subprocess.Popen(command_list, stdout = subprocess.PIPE, stderr = subprocess.PIPE, shell = is_shell_command, cwd = cwd, env = env) if timeout: while process.poll() is None: diff --git a/test/integ/installation.py b/test/integ/installation.py index 80a405d..dd4eb88 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -33,31 +33,26 @@ def setup(): def _setup(): global INSTALL_FAILURE, INSTALL_PATH, SDIST_FAILURE - original_cwd = os.getcwd() try: - try: - os.chdir(test.STEM_BASE) - stem.util.system.call('%s setup.py install --prefix %s' % (PYTHON_EXE, BASE_INSTALL_PATH), timeout = 60) - stem.util.system.call('%s setup.py clean --all' % PYTHON_EXE, timeout = 60) # tidy up the build directory - site_packages_paths = glob.glob('%s/lib*/*/site-packages' % BASE_INSTALL_PATH) + stem.util.system.call('%s setup.py install --prefix %s' % (PYTHON_EXE, BASE_INSTALL_PATH), timeout = 60, cwd = test.STEM_BASE) + stem.util.system.call('%s setup.py clean --all' % PYTHON_EXE, timeout = 60, cwd = test.STEM_BASE) # tidy up the build directory + site_packages_paths = glob.glob('%s/lib*/*/site-packages' % BASE_INSTALL_PATH) + + if len(site_packages_paths) != 1: + raise AssertionError('We should only have a single site-packages directory, but instead had: %s' % site_packages_paths) - if len(site_packages_paths) != 1: - raise AssertionError('We should only have a single site-packages directory, but instead had: %s' % site_packages_paths) + INSTALL_PATH = site_packages_paths[0] + except Exception as exc: + INSTALL_FAILURE = AssertionError("Unable to install with 'python setup.py install': %s" % exc) - INSTALL_PATH = site_packages_paths[0] + if not os.path.exists(DIST_PATH): + try: + stem.util.system.call('%s setup.py sdist' % PYTHON_EXE, timeout = 60, cwd = test.STEM_BASE) except Exception as exc: - INSTALL_FAILURE = AssertionError("Unable to install with 'python setup.py install': %s" % exc) - - if not os.path.exists(DIST_PATH): - try: - stem.util.system.call('%s setup.py sdist' % PYTHON_EXE, timeout = 60) - except Exception as exc: - SDIST_FAILURE = exc - else: - SDIST_FAILURE = AssertionError("%s already exists, maybe you manually ran 'python setup.py sdist'?" % DIST_PATH) - finally: - os.chdir(original_cwd) + SDIST_FAILURE = exc + else: + SDIST_FAILURE = AssertionError("%s already exists, maybe you manually ran 'python setup.py sdist'?" % DIST_PATH) if SETUP_THREAD is None: SETUP_THREAD = threading.Thread(target = _setup)

1 0

[stem/master] Testing with relative tor paths failed with RELATIVE target
by atagar＠torproject.org 24 May '17

24 May '17

commit 0d6212ed5f650f2364ac27dda88363b0de0265af Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 24 13:05:37 2017 -0700 Testing with relative tor paths failed with RELATIVE target When running with the RELATIVE target we shift our cwd causing relative paths to fail. Resolving them to absolute paths before that. Good thing to do anyway so our logs say what we're actually running. Another issue caught by catalyst... https://trac.torproject.org/projects/tor/ticket/22366 --- test/runner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/runner.py b/test/runner.py index 5686b4c..bbaa4aa 100644 --- a/test/runner.py +++ b/test/runner.py @@ -197,6 +197,7 @@ class Runner(object): self._test_dir = tempfile.mktemp('-stem-integ') original_cwd, data_dir_path = os.getcwd(), self._test_dir + self._tor_cmd = os.path.abspath(tor_cmd) if test.Target.RELATIVE in self.attribute_targets: tor_cwd = os.path.dirname(self._test_dir) @@ -207,7 +208,6 @@ class Runner(object): os.chdir(tor_cwd) data_dir_path = './%s' % os.path.basename(self._test_dir) - self._tor_cmd = tor_cmd self._custom_opts = extra_torrc_opts self._torrc_contents = BASE_TORRC % (data_dir_path, data_dir_path) @@ -217,7 +217,7 @@ class Runner(object): try: self._tor_cwd = os.getcwd() self._run_setup() - self._start_tor(tor_cmd) + self._start_tor(self._tor_cmd) # strip the testing directory from recv_message responses if we're # simulating a chroot setup

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 24 May '17

24 May '17

commit 572a3e6b0fe415ffdb87c826353fee9b25225578 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 24 19:45:08 2017 +0000 Update translations for bridgedb_completed --- fr/LC_MESSAGES/bridgedb.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po index f4dd10a..a6de016 100644 --- a/fr/LC_MESSAGES/bridgedb.po +++ b/fr/LC_MESSAGES/bridgedb.po @@ -8,9 +8,10 @@ # Cryptie <cryptie(a)fsfe.org>, 2014 # elouann, 2015 # fayçal fatihi <ofaycal.geo.x(a)gmail.com>, 2014 -# French language coordinator <french.translation(a)rbox.me>, 2016-2017 +# French language coordinator <french.coordinator(a)rbox.me>, 2017 +# French language coordinator <french.coordinator(a)rbox.me>, 2016-2017 # Frisson Reynald <frissonreynald(a)yahoo.fr>, 2014 -# hpatte <hadrien.44(a)gmail.com>, 2014 +# hpatte, 2014 # Lucas Leroy <lerlucas(a)rocketmail.com>, 2014 # Lunar <lunar(a)torproject.org>, 2013 # Onizuka, 2013 @@ -21,15 +22,15 @@ # syl_, 2016 # themen <themen2004(a)gmail.com>, 2014 # Towinet, 2014-2015 -# French language coordinator <french.translation(a)rbox.me>, 2015 +# French language coordinator <french.coordinator(a)rbox.me>, 2015 # Yannick Heintz, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-03-30 22:28+0000\n" -"Last-Translator: French language coordinator <french.translation(a)rbox.me>\n" +"PO-Revision-Date: 2017-05-24 19:34+0000\n" +"Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0