July 2020 - tor-commits - lists.torproject.org

[chutney/master] TorNet: clarify to run updateLastStatus() first
by nickm＠torproject.org 07 Jul '20

07 Jul '20

commit f43449e53d0f798c9f62d5507145ec9956b17ffd Author: c <c(a)chroniko.jp> Date: Thu May 21 08:01:31 2020 +0000 TorNet: clarify to run updateLastStatus() first Clarify in getLast*() and isBoostrapped() function documentation that updateLastStatus() affects these functions and must be called first. --- lib/chutney/TorNet.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 76512ab..6f71963 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -1194,6 +1194,9 @@ class LocalNodeController(NodeController): """Return the last onion descriptor message fetched by updateLastOnionServiceDescStatus as a 3-tuple of percentage complete, the hidden service version, and message. + + The return status depends on the last time updateLastStatus() + was called; that function must be called before this one. """ return self.most_recent_oniondesc_status @@ -1221,6 +1224,9 @@ class LocalNodeController(NodeController): """Return the last bootstrap message fetched by updateLastBootstrapStatus as a 3-tuple of percentage complete, keyword (optional), and message. + + The return status depends on the last time updateLastStatus() + was called; that function must be called before this one. """ return self.most_recent_bootstrap_status @@ -1233,7 +1239,11 @@ class LocalNodeController(NodeController): def isBootstrapped(self): """Return true iff the logfile says that this instance is - bootstrapped.""" + bootstrapped. + + The return status depends on the last time updateLastStatus() + was called; that function must be called before this one. + """ pct, _, _ = self.getLastBootstrapStatus() if pct != LocalNodeController.SUCCESS_CODE: return False

1 0

[chutney/master] Merge remote-tracking branch 'tor-github/pr/66'
by nickm＠torproject.org 07 Jul '20

07 Jul '20

commit 99bd06c7554b9113af8c0877b6eca4ceb95dcbaa Merge: bc6015c f43449e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 7 11:12:41 2020 -0400 Merge remote-tracking branch 'tor-github/pr/66' lib/chutney/TorNet.py | 107 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 84 insertions(+), 23 deletions(-) diff --cc lib/chutney/TorNet.py index 98ccc45,6f71963..37bef04 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@@ -869,51 -851,9 +869,53 @@@ class LocalNodeController(NodeControlle def __init__(self, env): NodeController.__init__(self, env) self._env = env + self.most_recent_oniondesc_status = None + self.most_recent_bootstrap_status = None + def _loadEd25519Id(self): + """ + Read the ed25519 identity key for this router, encode it using + base64, strip trailing padding, and return it. + + If the file does not exist, returns None. + + Raises a ValueError if the file appears to be corrupt. + """ + datadir = self._env['dir'] + key_file = os.path.join(datadir, 'keys', + "ed25519_master_id_public_key") + # If we're called early during bootstrap, the file won't have been + # created yet. (And some very old tor versions don't have ed25519.) + if not os.path.exists(key_file): + debug(("File {} does not exist. Are you running a very old tor " + "version?").format(key_file)) + return None + + EXPECTED_ED25519_FILE_SIZE = 64 + key_file_size = os.stat(key_file).st_size + if key_file_size != EXPECTED_ED25519_FILE_SIZE: + raise ValueError( + ("The current size of the file is {} bytes, which is not" + "matching the expected value of {} bytes") + .format(key_file_size, EXPECTED_ED25519_FILE_SIZE)) + + with open(key_file, 'rb') as f: + ED25519_KEY_POSITION = 32 + f.seek(ED25519_KEY_POSITION) + rest_file = f.read() + encoded_value = base64.b64encode(rest_file) + # tor strips trailing base64 padding + ed25519_id = encoded_value.decode('utf-8').replace('=', '') + EXPECTED_ED25519_BASE64_KEY_SIZE = 43 + key_base64_size = len(ed25519_id) + if (key_base64_size != EXPECTED_ED25519_BASE64_KEY_SIZE): + raise ValueError( + ("The current length of the key is {}, which is not " + "matching the expected length of {}") + .format(key_base64_size, + EXPECTED_ED25519_BASE64_KEY_SIZE)) + return ed25519_id + def getNick(self): """Return the nickname for this node.""" return self._env['nick'] @@@ -1045,23 -958,19 +1047,23 @@@ """Returns the amount of time to wait before verifying, after the network has bootstrapped, and the dir info has been distributed. - Based on whether this node is an onion service. + Based on whether this node has unchecked directory info, or other + known timing issues. """ - if self.getOnionService(): + if self.isOnionService(): return LocalNodeController.HS_WAIT_FOR_UNCHECKED_DIR_INFO + elif self.getBridge(): + return LocalNodeController.BRIDGE_WAIT_FOR_UNCHECKED_DIR_INFO + elif self.isLegacyTorVersion(): + return LocalNodeController.LEGACY_WAIT_FOR_UNCHECKED_DIR_INFO else: - return LocalNodeController.NODE_WAIT_FOR_UNCHECKED_DIR_INFO + return LocalNodeController.DEFAULT_WAIT_FOR_UNCHECKED_DIR_INFO def getPid(self): - """Assuming that this node has its pidfile in ${dir}/pid, return - the pid of the running process, or None if there is no pid in the - file. + """Read the pidfile, and return the pid of the running process. + Returns None if there is no pid in the file. """ - pidfile = os.path.join(self._env['dir'], 'pid') + pidfile = self._env['pidfile'] if not os.path.exists(pidfile): return None

1 0

[chutney/master] TorNet: add getLastOnionServiceDescStatus()
by nickm＠torproject.org 07 Jul '20

07 Jul '20

commit 70cd3c3943244f10ea54de949434db5b8049aa2f Author: c <c(a)chroniko.jp> Date: Sun Apr 5 09:30:50 2020 +0000 TorNet: add getLastOnionServiceDescStatus() Use this function to check info logs for uploads of onion descriptors. --- lib/chutney/TorNet.py | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index b2fde0c..db7845e 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -1154,6 +1154,40 @@ class LocalNodeController(NodeController): SHORT_FILE_CODE = -100 NO_PROGRESS_CODE = 0 SUCCESS_CODE = 100 + ONIONDESC_PUBLISHED_CODE = 200 + HSV2_KEYWORD = "hidden service v2" + HSV3_KEYWORD = "hidden service v3" + + def getLastOnionServiceDescStatus(self): + """Look through info-level logs for onion service descriptor uploads + and return a 3-tuple of percentage complete, the hidden service + version, and message. + """ + logfname = self.getLogfile(info=True) + if not os.path.exists(logfname): + return (LocalNodeController.MISSING_FILE_CODE, + "no_logfile", "There is no logfile yet.") + percent = LocalNodeController.NO_RECORDS_CODE + keyword = "no_message" + message = "No onion service descriptor messages yet." + with open(logfname, 'r') as f: + for line in f: + m_v2 = re.search(r'Launching upload for hidden service (.*)', + line) + if m_v2: + percent = LocalNodeController.ONIONDESC_PUBLISHED_CODE + keyword = LocalNodeController.HSV2_KEYWORD + message = m_v2.groups()[0] + break + # else + m_v3 = re.search(r'Service ([^\s]+ [^\s]+ descriptor of revision .*)', + line) + if m_v3: + percent = LocalNodeController.ONIONDESC_PUBLISHED_CODE + keyword = LocalNodeController.HSV3_KEYWORD + message = m_v3.groups()[0] + break + return (percent, keyword, message) def getLastBootstrapStatus(self): """Look through the logs and return the last bootstrap message

1 0

[tor/master] Mark some log messages as used by Chutney.
by nickm＠torproject.org 07 Jul '20

07 Jul '20

commit 118c35b55bb7c6f03a6a39558a35ee754b58942a Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jul 7 12:45:29 2020 +0300 Mark some log messages as used by Chutney. --- src/feature/hs/hs_service.c | 3 +++ src/feature/rend/rendservice.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index 249eb47b5..995c1ca78 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -2874,6 +2874,9 @@ upload_descriptor_to_hsdir(const hs_service_t *service, hsdir->hsdir_index.store_first; char *blinded_pubkey_log_str = tor_strdup(hex_str((char*)&desc->blinded_kp.pubkey.pubkey, 32)); + /* This log message is used by Chutney as part of its bootstrap + * detection mechanism. Please don't change without first checking + * Chutney. */ log_info(LD_REND, "Service %s %s descriptor of revision %" PRIu64 " initiated upload request to %s with index %s (%s)", safe_str_client(service->onion_address), diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c index 1c456cb6e..7f2db4314 100644 --- a/src/feature/rend/rendservice.c +++ b/src/feature/rend/rendservice.c @@ -3827,6 +3827,9 @@ upload_service_descriptor(rend_service_t *service) rend_get_service_id(service->desc->pk, serviceid); if (get_options()->PublishHidServDescriptors) { /* Post the current descriptors to the hidden service directories. */ + /* This log message is used by Chutney as part of its bootstrap + * detection mechanism. Please don't change without first checking + * Chutney. */ log_info(LD_REND, "Launching upload for hidden service %s", serviceid); directory_post_to_hs_dir(service->desc, descs, NULL, serviceid,

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1974/head'
by nickm＠torproject.org 07 Jul '20

07 Jul '20

commit 9e33391ebb01700d3f3f9cb29a6b74756559de4a Merge: 640a777c9 118c35b55 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 7 11:08:20 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1974/head' src/feature/hs/hs_service.c | 3 +++ src/feature/rend/rendservice.c | 3 +++ 2 files changed, 6 insertions(+)

1 0

[tor/master] Merge branch 'ticket33236_045_01'
by dgoulet＠torproject.org 07 Jul '20

07 Jul '20

commit 640a777c9bf3b581dd951a9021aefe3f8dd9d3ce Merge: aa80f73fc 809c86470 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jul 7 11:01:26 2020 -0400 Merge branch 'ticket33236_045_01' changes/ticket33236 | 4 ++ src/app/config/resolve_addr.c | 58 ++++++++++++++++++++++++++++ src/app/config/resolve_addr.h | 6 +++ src/test/test_config.c | 90 ++++++++++++++++++++++++++++++++++++++----- 4 files changed, 149 insertions(+), 9 deletions(-)

1 0

[tor/master] addr: Attempt to learn our address with ORPort
by dgoulet＠torproject.org 07 Jul '20

07 Jul '20

commit 809c8647079e3e84d401db25055144c5180aa75d Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Jul 6 11:09:39 2020 -0400 addr: Attempt to learn our address with ORPort If no Address statement are found in the configuration file, attempt to learn our address by looking at the ORPort address if any. Specifying an address is optional so if we can't find one, it is fine, we move on to the next discovery mechanism. Note that specifying a hostname on the ORPort is not yet supported at this commit. Closes #33236 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket33236 | 4 ++ src/app/config/resolve_addr.c | 58 ++++++++++++++++++++++++++++ src/app/config/resolve_addr.h | 6 +++ src/test/test_config.c | 90 ++++++++++++++++++++++++++++++++++++++----- 4 files changed, 149 insertions(+), 9 deletions(-) diff --git a/changes/ticket33236 b/changes/ticket33236 new file mode 100644 index 000000000..d2b1d7e4d --- /dev/null +++ b/changes/ticket33236 @@ -0,0 +1,4 @@ + o Minor feature (relay, address discovery): + - If Address is not found in torrc, attempt to learn our address with the + configured ORPort address if any. Closes ticket 33236. + diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c index 808c5ddf0..caca5a37d 100644 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@ -370,6 +370,63 @@ get_address_from_interface(const or_options_t *options, int warn_severity, return FN_RET_OK; } +/** @brief Get IP address from the ORPort (if any). + * + * @param options Global configuration options. + * @param warn_severity Log level that should be used on error. + * @param family IP address family. Only AF_INET and AF_INET6 are supported. + * @param method_out OUT: Always "CONFIGURED_ORPORT" on success which is + * detailed in the control-spec.txt as actions + * for "STATUS_SERVER". + * @param hostname_out OUT: String containing the ORPort hostname if any. + * @param addr_out OUT: Tor address found if any. + * + * @return Return 0 on success that is an address has been found. Return + * error code ERR_* found at the top of the file. + */ +static fn_address_ret_t +get_address_from_orport(const or_options_t *options, int warn_severity, + int family, const char **method_out, + char **hostname_out, tor_addr_t *addr_out) +{ + int ret; + const tor_addr_t *addr; + + tor_assert(method_out); + tor_assert(hostname_out); + tor_assert(addr_out); + + log_debug(LD_CONFIG, "Attempting to get address from ORPort"); + + if (!options->ORPort_set) { + log_info(LD_CONFIG, "No ORPort found in configuration."); + /* No ORPort statement, inform caller to try next method. */ + return FN_RET_NEXT; + } + + /* Get ORPort for requested family. */ + addr = get_orport_addr(family); + if (!addr) { + /* No address configured for the ORPort. Ignore. */ + return FN_RET_NEXT; + } + + /* We found the ORPort address. Just make sure it can be used. */ + ret = address_can_be_used(addr, options, warn_severity, true); + if (ret < 0) { + /* Unable to use address. Inform caller to try next method. */ + return FN_RET_NEXT; + } + + /* Found it! */ + *method_out = "CONFIGURED_ORPORT"; + tor_addr_copy(addr_out, addr); + + log_fn(warn_severity, LD_CONFIG, "Address found from ORPort: %s", + fmt_addr(addr_out)); + return FN_RET_OK; +} + /** @brief Update the last resolved address cache using the given address. * * A log notice is emitted if the given address has changed from before. Not @@ -450,6 +507,7 @@ static fn_address_ret_t { /* These functions are in order for our find address algorithm. */ get_address_from_config, + get_address_from_orport, get_address_from_interface, get_address_from_hostname, }; diff --git a/src/app/config/resolve_addr.h b/src/app/config/resolve_addr.h index 54f55ba36..e6f8a7255 100644 --- a/src/app/config/resolve_addr.h +++ b/src/app/config/resolve_addr.h @@ -9,8 +9,14 @@ #ifndef TOR_CONFIG_RESOLVE_ADDR_H #define TOR_CONFIG_RESOLVE_ADDR_H +#include "app/config/config.h" +#include "core/mainloop/connection.h" + #include "app/config/or_options_st.h" +#define get_orport_addr(family) \ + (get_first_advertised_addr_by_type_af(CONN_TYPE_OR_LISTENER, family)) + bool find_my_address(const or_options_t *options, int family, int warn_severity, tor_addr_t *addr_out, const char **method_out, char **hostname_out); diff --git a/src/test/test_config.c b/src/test/test_config.c index 765db03c0..0862ba5c4 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -1256,13 +1256,15 @@ get_interface_address6_failure(int severity, sa_family_t family, /** Helper macro: Cleanup the address and variables used after a * find_my_address() call. */ #undef CLEANUP_FOUND_ADDRESS -#define CLEANUP_FOUND_ADDRESS \ - do { \ - config_free_lines(options->Address); \ - tor_free(options->DirAuthorities); \ - tor_free(hostname_out); \ - tor_addr_make_unspec(&resolved_addr); \ - tor_addr_make_unspec(&test_addr); \ +#define CLEANUP_FOUND_ADDRESS \ + do { \ + config_free_lines(options->Address); \ + config_free_lines(options->ORPort_lines); \ + options->ORPort_set = 0; \ + tor_free(options->DirAuthorities); \ + tor_free(hostname_out); \ + tor_addr_make_unspec(&resolved_addr); \ + tor_addr_make_unspec(&test_addr); \ } while (0) /** Test both IPv4 and IPv6 coexisting together in the configuration. */ @@ -1418,6 +1420,7 @@ typedef struct find_my_address_params_t { int family; const char *public_ip; const char *internal_ip; + const char *orport; } find_my_address_params_t; static find_my_address_params_t addr_param_v4 = { @@ -1430,8 +1433,8 @@ static find_my_address_params_t addr_param_v4 = { static find_my_address_params_t addr_param_v6 = { .idx = 1, .family = AF_INET6, - .public_ip = "4242::4242", - .internal_ip = "::1", + .public_ip = "[4242::4242]", + .internal_ip = "[::1]", }; static void @@ -1733,6 +1736,75 @@ test_config_find_my_address(void *arg) VALIDATE_FOUND_ADDRESS(false, NULL, NULL); CLEANUP_FOUND_ADDRESS; + /* + * Case 13: + * 1. Address is NULL. + * 2. ORPort has a valid public address. + */ + { + char *msg = NULL; + int n, w, ret; + char *orport_line = NULL; + + options->Address = NULL; + tor_asprintf(&orport_line, "%s:9001", p->public_ip); + config_line_append(&options->ORPort_lines, "ORPort", orport_line); + tor_free(orport_line); + + if (p->family == AF_INET6) { + /* XXX: Tor does _not_ allow an IPv6 only ORPort thus we need to add a + * bogus IPv4 at the moment. */ + config_line_append(&options->ORPort_lines, "ORPort", "1.1.1.1:9001"); + } + + ret = parse_ports(options, 0, &msg, &n, &w); + tt_int_op(ret, OP_EQ, 0); + tor_addr_parse(&test_addr, p->public_ip); + } + + retval = find_my_address(options, p->family, LOG_NOTICE, &resolved_addr, + &method_used, &hostname_out); + VALIDATE_FOUND_ADDRESS(true, "CONFIGURED_ORPORT", NULL); + CLEANUP_FOUND_ADDRESS; + + /* + * Case 14: + * 1. Address is NULL. + * 2. ORPort has an internal address thus fails. + * 3. Interface as a valid address. + */ + { + char *msg = NULL; + int n, w, ret; + char *orport_line = NULL; + + options->Address = NULL; + tor_asprintf(&orport_line, "%s:9001", p->internal_ip); + config_line_append(&options->ORPort_lines, "ORPort", orport_line); + tor_free(orport_line); + + if (p->family == AF_INET6) { + /* XXX: Tor does _not_ allow an IPv6 only ORPort thus we need to add a + * bogus IPv4 at the moment. */ + config_line_append(&options->ORPort_lines, "ORPort", "1.1.1.1:9001"); + } + + ret = parse_ports(options, 0, &msg, &n, &w); + tt_int_op(ret, OP_EQ, 0); + } + tor_addr_parse(&test_addr, ret_get_interface_address6_08080808[p->idx]); + + MOCK(get_interface_address6, get_interface_address6_08080808); + + prev_n_get_interface_address6 = n_get_interface_address6; + + retval = find_my_address(options, p->family, LOG_NOTICE, &resolved_addr, + &method_used, &hostname_out); + + tt_int_op(n_get_interface_address6, OP_EQ, ++prev_n_get_interface_address6); + VALIDATE_FOUND_ADDRESS(true, "INTERFACE", NULL); + CLEANUP_FOUND_ADDRESS; + UNMOCK(get_interface_address6); UNMOCK(tor_gethostname); UNMOCK(tor_addr_lookup);

1 0

[torspec/master] control-spec: Add CONFIGURED_ORPORT to SERVER_STATUS event
by dgoulet＠torproject.org 07 Jul '20

07 Jul '20

commit 493f1524a12821dbf8ab0c23c08275816f4d31c8 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jul 7 10:51:36 2020 -0400 control-spec: Add CONFIGURED_ORPORT to SERVER_STATUS event A tor relay now can discover its address using the ORPort address if one is specified. For that reason, we add a new method to the SERVER_STATUS event that is CONFIGURED_ORPORT in order to identify the configured address on the ORPort. Related to #33236 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- control-spec.txt | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 77cc01c..0334639 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -2900,16 +2900,18 @@ EXTERNAL_ADDRESS "ADDRESS=IP" "HOSTNAME=NAME" - "METHOD=CONFIGURED/DIRSERV/RESOLVED/INTERFACE/GETHOSTNAME" - Our best idea for our externally visible IP has changed to 'IP'. - If 'HOSTNAME' is present, we got the new IP by resolving 'NAME'. If the - method is 'CONFIGURED', the IP was given verbatim as a configuration - option. If the method is 'RESOLVED', we resolved the Address - configuration option to get the IP. If the method is 'GETHOSTNAME', - we resolved our hostname to get the IP. If the method is 'INTERFACE', - we got the address of one of our network interfaces to get the IP. If - the method is 'DIRSERV', a directory server told us a guess for what - our IP might be. + "METHOD=CONFIGURED/CONFIGURED_ORPORT/DIRSERV/RESOLVED/ + INTERFACE/GETHOSTNAME" + Our best idea for our externally visible IP has changed to 'IP'. If + 'HOSTNAME' is present, we got the new IP by resolving 'NAME'. If the + method is 'CONFIGURED', the IP was given verbatim as the Address + configuration option. If the method is 'CONFIGURED_ORPORT', the IP was + given verbatim in the ORPort configuration option. If the method is + 'RESOLVED', we resolved the Address configuration option to get the IP. + If the method is 'GETHOSTNAME', we resolved our hostname to get the IP. + If the method is 'INTERFACE', we got the address of one of our network + interfaces to get the IP. If the method is 'DIRSERV', a directory + server told us a guess for what our IP might be. {Controllers may want to record this info and display it to the user.}

1 0

[tor/master] CI: Fix Appveyor printf format error
by ahf＠torproject.org 07 Jul '20

07 Jul '20

commit d9cc2b2928eab045f89d0abf95a9e5c75e290ff8 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jul 7 09:20:28 2020 -0400 CI: Fix Appveyor printf format error For some reasons, Appveyor started to use the stdio printf format for 64 bit values (PRIu64, ...). Mingw doesn't like that so force it to use the Windows specific macros by setting D__USE_MINGW_ANSI_STDIO=0. Fixes #40026 --- .appveyor.yml | 2 +- changes/ticket40026 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 461eacb4a..03cf2f69f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -87,7 +87,7 @@ build_script: # mingw zstd doesn't come with a pkg-config file, so we manually # configure its flags. liblzma just works. #> - Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --with-openssl-dir=/${env:compiler_path} --disable-asciidoc --enable-fatal-warnings ${env:hardening}" + Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --with-openssl-dir=/${env:compiler_path} --disable-asciidoc --enable-fatal-warnings ${env:hardening} CFLAGS='-D__USE_MINGW_ANSI_STDIO=0'" Execute-Bash "V=1 make -k -j2" Execute-Bash "V=1 make -k -j2 install" } diff --git a/changes/ticket40026 b/changes/ticket40026 new file mode 100644 index 000000000..f87c2964e --- /dev/null +++ b/changes/ticket40026 @@ -0,0 +1,3 @@ + o Minor bugfix (CI, Windows): + - Don't use stdio 64 bit printf format when compiling with MINGW on + Appveyor. Fixes bug 40026; bugfix on 0.3.5.5-alpha.

1 0

[tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
by ahf＠torproject.org 07 Jul '20

07 Jul '20

commit d4c79cae76536673184ffd4f6116bcd07fd0b1f5 Merge: 05ca50c9a a213d2793 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jul 7 14:48:36 2020 +0000 Merge branch 'maint-0.4.3' into maint-0.4.4 .appveyor.yml | 2 +- changes/ticket40026 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0