October 2019 - tor-commits - lists.torproject.org

[tor/master] lightly sort changelog entries
by nickm＠torproject.org 03 Oct '19

03 Oct '19

commit 5ae1a574dc11035fcea915948943c9a0a2082eae Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 3 12:24:47 2019 -0400 lightly sort changelog entries --- ChangeLog | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 915509cfa..6f1e09dd2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,22 +1,22 @@ Changes in version 0.4.2.2-alpha - 2019-10-0? This release fixes several bugs from the previous alpha release. + o Major features (directory authorities): + - Directory authorities now reject relays running all currently + deprecated release series. The currently supported release series + are: 0.2.9, 0.3.5, 0.4.0, 0.4.1, and 0.4.2. Closes ticket 31549. + o Major bugfixes (embedded Tor): - Avoid a possible crash when restarting Tor in embedded mode and enabling a different set of publish/subscribe messages. Fixes bug 31898; bugfix on 0.4.1.1-alpha. - o Major bugfixes (torrc): + o Major bugfixes (torrc parsing): - Stop ignoring torrc options after an %include directive, when the included directory ends with a file that does not contain any config options. (But does contain comments or whitespace.) Fixes bug 31408; bugfix on 0.3.1.1-alpha. - o Minor features (authority): - - Directory authorities now reject relays running all currently - deprecated release series. The currently supported release series - are: 0.2.9, 0.3.5, 0.4.0, 0.4.1, and 0.4.2. Closes ticket 31549. - o Minor features (auto-formatting scripts): - When annotating C macros, never generate a line that our check- spaces script would reject. Closes ticket 31759. @@ -48,7 +48,7 @@ Changes in version 0.4.2.2-alpha - 2019-10-0? services by pointing them to the right documentation. Closes ticket 28966. - o Minor bugfixes (Appveyor CI): + o Minor bugfixes (Appveyor continuous integration): - Avoid spurious errors when Appveyor CI fails before the install step. Fixes bug 31884; bugfix on 0.3.4.2-alpha. @@ -105,6 +105,8 @@ Changes in version 0.4.2.2-alpha - 2019-10-0? - Use SEVERITY_MASK_IDX() to find the LOG_* mask indexes in the unit tests and fuzzers, rather than using hard-coded values. Closes ticket 31334. + - Interface for function `decrypt_desc_layer` cleaned up. Closes + ticket 31589. o Documentation: - Document the signal-safe logging behaviour in the tor man page. @@ -117,10 +119,6 @@ Changes in version 0.4.2.2-alpha - 2019-10-0? This is based on the old "tor-guts.git" repository, which we are adopting and superseding. Closes ticket 31849. - o Code simplification and refactoring (onion services): - - Interface for function `decrypt_desc_layer` cleaned up. Closes - ticket 31589. - Changes in version 0.4.1.6 - 2019-09-19 This release backports several bugfixes to improve stability and

1 0

[tor/master] Light edits on 0.4.2.2-alpha changelog.
by nickm＠torproject.org 03 Oct '19

03 Oct '19

commit db976cd9277199664f7b55e2f9b105f6e96174c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 3 12:34:21 2019 -0400 Light edits on 0.4.2.2-alpha changelog. --- ChangeLog | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6f1e09dd2..bddac3825 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ Changes in version 0.4.2.2-alpha - 2019-10-0? - This release fixes several bugs from the previous alpha release. + This release fixes several bugs from the previous alpha release, and + from earlier versions. It also includes a change in authorities, so + that they begin to reject the currently unsupported release series. o Major features (directory authorities): - Directory authorities now reject relays running all currently @@ -14,7 +16,7 @@ Changes in version 0.4.2.2-alpha - 2019-10-0? o Major bugfixes (torrc parsing): - Stop ignoring torrc options after an %include directive, when the included directory ends with a file that does not contain any - config options. (But does contain comments or whitespace.) Fixes + config options (but does contain comments or whitespace). Fixes bug 31408; bugfix on 0.3.1.1-alpha. o Minor features (auto-formatting scripts): @@ -24,19 +26,16 @@ Changes in version 0.4.2.2-alpha - 2019-10-0? Closes ticket 31779. o Minor features (continuous integration): - - When building on Appveyor, pass the "-k" flag to make, so that we - are informed of all compilation failures, not just the first one - or two. Closes part of ticket 31372. - - When building on Travis, pass the "-k" flag to make, so that we - are informed of all compilation failures, not just the first one - or two. Closes part of ticket 31372. + - When building on Appveyor and Travis, pass the "-k" flag to make, + so that we are informed of all compilation failures, not just the + first one or two. Closes ticket 31372. o Minor features (geoip): - Update geoip and geoip6 to the October 1 2019 Maxmind GeoLite2 Country database. Closes ticket 31931. o Minor features (maintenance scripts): - - Add a coccinelle script to detect bugs caused by incrementing or + - Add a Coccinelle script to detect bugs caused by incrementing or decrementing a variable inside a call to log_debug(). Since log_debug() is a macro whose arguments are conditionally evaluated, it is usually an error to do this. One such bug was

1 0

[tor/master] log: Remove duplicate code and an outdated comment
by asn＠torproject.org 03 Oct '19

03 Oct '19

commit 4c88ebcf4728084cad0a1f177eb9cdb107388581 Author: teor <teor(a)torproject.org> Date: Thu Sep 26 13:31:32 2019 +1000 log: Remove duplicate code and an outdated comment Preparation for 31854. --- src/lib/log/log.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/lib/log/log.c b/src/lib/log/log.c index d2002f6ea..994fdbdd9 100644 --- a/src/lib/log/log.c +++ b/src/lib/log/log.c @@ -584,8 +584,7 @@ logv,(int severity, log_domain_mask_t domain, const char *funcname, /* check that severity is sane. Overrunning the masks array leads to * interesting and hard to diagnose effects */ raw_assert(severity >= LOG_ERR && severity <= LOG_DEBUG); - /* check that we've initialised the log mutex before we try to lock it */ - raw_assert(log_mutex_initialized); + LOCK_LOGS(); if ((! (domain & LD_NOCB)) && pending_cb_messages @@ -866,9 +865,6 @@ logs_close_sigsafe(void) * logfiles (it is probably present, but it might not be due to thread * racing issues). After this function is called, the caller shouldn't * refer to victim anymore. - * - * Long-term, we need to do something about races in the log subsystem - * in general. See bug 222 for more details. */ static void delete_log(logfile_t *victim)

1 0

[tor/master] log: Define count, boundary, and all macros for domains and flags
by asn＠torproject.org 03 Oct '19

03 Oct '19

commit 25c5322dfe228178391b37fffd3333abdf57baa5 Author: teor <teor(a)torproject.org> Date: Thu Sep 26 13:33:17 2019 +1000 log: Define count, boundary, and all macros for domains and flags And do static checks on those macro definitions. Part of 31854. --- src/lib/log/log.c | 4 +++- src/lib/log/log.h | 13 ++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/lib/log/log.c b/src/lib/log/log.c index 994fdbdd9..db4f15441 100644 --- a/src/lib/log/log.c +++ b/src/lib/log/log.c @@ -1337,7 +1337,9 @@ static const char *domain_list[] = { CTASSERT(ARRAY_LENGTH(domain_list) == N_LOGGING_DOMAINS + 1); -CTASSERT((UINT64_C(1)<<(N_LOGGING_DOMAINS-1)) < LOWEST_RESERVED_LD_FLAG_); +CTASSERT(HIGHEST_RESERVED_LD_DOMAIN_ < LD_ALL_DOMAINS); +CTASSERT(LD_ALL_DOMAINS < LOWEST_RESERVED_LD_FLAG_); +CTASSERT(LOWEST_RESERVED_LD_FLAG_ < LD_ALL_FLAGS); /** Return a bitmask for the log domain for which domain is the name, * or 0 if there is no such name. */ diff --git a/src/lib/log/log.h b/src/lib/log/log.h index da4bcbe60..b957fd156 100644 --- a/src/lib/log/log.h +++ b/src/lib/log/log.h @@ -117,10 +117,21 @@ #define LD_BTRACK (UINT64_C(1)<<28) /** Message-passing backend. */ #define LD_MESG (UINT64_C(1)<<29) + +/** The number of log domains. */ #define N_LOGGING_DOMAINS 30 +/** The highest log domain */ +#define HIGHEST_RESERVED_LD_DOMAIN_ (UINT64_C(1)<<(N_LOGGING_DOMAINS - 1)) +/** All log domains. */ +#define LD_ALL_DOMAINS ((~(UINT64_C(0)))>>(64 - N_LOGGING_DOMAINS)) +/** The number of log flags. */ +#define N_LOGGING_FLAGS 3 /** First bit that is reserved in log_domain_mask_t for non-domain flags. */ -#define LOWEST_RESERVED_LD_FLAG_ (UINT64_C(1)<<61) +#define LOWEST_RESERVED_LD_FLAG_ (UINT64_C(1)<<(64 - N_LOGGING_FLAGS)) +/** All log flags. */ +#define LD_ALL_FLAGS ((~(UINT64_C(0)))<<(64 - N_LOGGING_FLAGS)) + #ifdef TOR_UNIT_TESTS /** This log message should not be intercepted by mock_saving_logv */ #define LD_NO_MOCK (UINT64_C(1)<<61)

1 0

[tor/master] log: When initialising log domain masks, only set known log domains
by asn＠torproject.org 03 Oct '19

03 Oct '19

commit db329522ef6f0d0971111cbd07f35d54e0c7eced Author: teor <teor(a)torproject.org> Date: Thu Sep 26 13:37:06 2019 +1000 log: When initialising log domain masks, only set known log domains And add a runtime test that checks for unknown domains and flags. Fixes bug 31854; bugfix on 0.2.1.1-alpha. --- changes/bug31854 | 3 +++ src/lib/log/log.c | 12 ++++++++---- src/test/test_options.c | 6 +++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/changes/bug31854 b/changes/bug31854 new file mode 100644 index 000000000..692a192fd --- /dev/null +++ b/changes/bug31854 @@ -0,0 +1,3 @@ + o Minor bugfixes (logging): + - When initialising log domain masks, only set known log domains. + Fixes bug 31854; bugfix on 0.2.1.1-alpha. diff --git a/src/lib/log/log.c b/src/lib/log/log.c index db4f15441..7c18bea0d 100644 --- a/src/lib/log/log.c +++ b/src/lib/log/log.c @@ -628,6 +628,10 @@ void tor_log(int severity, log_domain_mask_t domain, const char *format, ...) { va_list ap; + + /* check that domain is composed of known domains and flags */ + raw_assert((domain & (LD_ALL_DOMAINS|LD_ALL_FLAGS)) == domain); + if (severity > log_global_min_severity_) return; va_start(ap,format); @@ -927,7 +931,7 @@ set_log_severity_config(int loglevelMin, int loglevelMax, raw_assert(loglevelMax >= LOG_ERR && loglevelMax <= LOG_DEBUG); memset(severity_out, 0, sizeof(log_severity_list_t)); for (i = loglevelMin; i >= loglevelMax; --i) { - severity_out->masks[SEVERITY_MASK_IDX(i)] = ~0u; + severity_out->masks[SEVERITY_MASK_IDX(i)] = LD_ALL_DOMAINS; } } @@ -1421,7 +1425,7 @@ parse_log_severity_config(const char **cfg_ptr, const char *dash, *space; char *sev_lo, *sev_hi; int low, high, i; - log_domain_mask_t domains = ~0u; + log_domain_mask_t domains = LD_ALL_DOMAINS; if (*cfg == '[') { int err = 0; @@ -1439,7 +1443,7 @@ parse_log_severity_config(const char **cfg_ptr, tor_free(domains_str); SMARTLIST_FOREACH_BEGIN(domains_list, const char *, domain) { if (!strcmp(domain, "*")) { - domains = ~0u; + domains = LD_ALL_DOMAINS; } else { log_domain_mask_t d; int negate=0; @@ -1535,7 +1539,7 @@ switch_logs_debug(void) LOCK_LOGS(); for (lf = logfiles; lf; lf=lf->next) { for (i = LOG_DEBUG; i >= LOG_ERR; --i) - lf->severities->masks[SEVERITY_MASK_IDX(i)] = ~0u; + lf->severities->masks[SEVERITY_MASK_IDX(i)] = LD_ALL_DOMAINS; } log_global_min_severity_ = get_min_log_level(); UNLOCK_LOGS(); diff --git a/src/test/test_options.c b/src/test/test_options.c index b3654ede7..9eb5a4392 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -54,9 +54,9 @@ setup_log_callback(void) { log_severity_list_t lst; memset(&lst, 0, sizeof(lst)); - lst.masks[SEVERITY_MASK_IDX(LOG_ERR)] = ~0; - lst.masks[SEVERITY_MASK_IDX(LOG_WARN)] = ~0; - lst.masks[SEVERITY_MASK_IDX(LOG_NOTICE)] = ~0; + lst.masks[SEVERITY_MASK_IDX(LOG_ERR)] = LD_ALL_DOMAINS; + lst.masks[SEVERITY_MASK_IDX(LOG_WARN)] = LD_ALL_DOMAINS; + lst.masks[SEVERITY_MASK_IDX(LOG_NOTICE)] = LD_ALL_DOMAINS; add_callback_log(&lst, log_cback); mark_logs_temp(); }

1 0

[tor/master] Merge branch 'tor-github/pr/1377'
by asn＠torproject.org 03 Oct '19

03 Oct '19

commit 9309eaf8ead0058aed6f1399b63fc8ae54cef799 Merge: 3778b97ca db329522e Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Oct 3 19:13:57 2019 +0300 Merge branch 'tor-github/pr/1377' changes/bug31854 | 3 +++ src/lib/log/log.c | 22 ++++++++++++---------- src/lib/log/log.h | 13 ++++++++++++- src/test/test_options.c | 6 +++--- 4 files changed, 30 insertions(+), 14 deletions(-)

1 0

[tor/master] Authorities reject relays running unsupported Tor release series.
by asn＠torproject.org 03 Oct '19

03 Oct '19

commit 4d4e2abd2f961e735b9b8d93e9e09695515b8ac8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 29 11:43:43 2019 -0400 Authorities reject relays running unsupported Tor release series. Our minimum version is now 0.2.9.5-alpha. Series 0.3.0, 0.3.1, 0.3.2, 0.3.3, and 0.3.4 are now rejected. Also, extract this version-checking code into a new function, so we can test it. Closes ticket 31549. Also reject 0.3.5.0 through 0.3.5.6-rc as unstable. --- changes/ticket31549 | 4 +++ src/feature/dirauth/process_descs.c | 59 +++++++++++++++++++++++++++---------- src/feature/dirauth/process_descs.h | 2 ++ 3 files changed, 49 insertions(+), 16 deletions(-) diff --git a/changes/ticket31549 b/changes/ticket31549 new file mode 100644 index 000000000..2c27aca4f --- /dev/null +++ b/changes/ticket31549 @@ -0,0 +1,4 @@ + o Minor features (authority): + - Directory authorities now reject relays running all currently + deprecated release series. The currently supported release series + are: 0.2.9, 0.3.5, 0.4.0, 0.4.1, and 0.4.2. Closes ticket 31549. diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c index e1a02179b..74a2cde1b 100644 --- a/src/feature/dirauth/process_descs.c +++ b/src/feature/dirauth/process_descs.c @@ -315,6 +315,47 @@ dirserv_would_reject_router(const routerstatus_t *rs) return (res & FP_REJECT) != 0; } +/** + * Check whether the platform string in platform describes a platform + * that, as a directory authority, we want to reject. If it does, return + * true, and set *msg (if present) to a rejection message. Otherwise + * return false. + */ +STATIC bool +dirserv_rejects_tor_version(const char *platform, + const char **msg) +{ + if (!platform) + return false; + + static const char please_upgrade_string[] = + "Tor version is insecure or unsupported. Please upgrade!"; + + /* Versions before Tor 0.2.9 are unsupported. Versions between 0.2.9.0 and + * 0.2.9.4 suffer from bug #20499, where relays don't keep their consensus + * up to date */ + if (!tor_version_as_new_as(platform,"0.2.9.5-alpha")) { + if (msg) + *msg = please_upgrade_string; + return true; + } + + /* Series between Tor 0.3.0 and 0.3.4 inclusive are unsupported, and some + * have bug #27841, which makes them broken as intro points. Reject them. + * + * Also reject unstable versions of 0.3.5, since (as of this writing) + * they are almost none of the network. */ + if (tor_version_as_new_as(platform,"0.3.0.0-alpha-dev") && + !tor_version_as_new_as(platform,"0.3.5.7")) { + if (msg) { + *msg = please_upgrade_string; + } + return true; + } + + return false; +} + /** Helper: As dirserv_router_get_status, but takes the router fingerprint * (hex, no spaces), nickname, address (used for logging only), IP address, OR * port and platform (logging only) as arguments. @@ -347,22 +388,8 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, } } - /* Versions before Tor 0.2.4.18-rc are too old to support, and are - * missing some important security fixes too. Disable them. */ - if (platform && !tor_version_as_new_as(platform,"0.2.4.18-rc")) { - if (msg) - *msg = "Tor version is insecure or unsupported. Please upgrade!"; - return FP_REJECT; - } - - /* Tor 0.2.9.x where x<5 suffers from bug #20499, where relays don't - * keep their consensus up to date so they make bad guards. - * The simple fix is to just drop them from the network. */ - if (platform && - tor_version_as_new_as(platform,"0.2.9.0-alpha") && - !tor_version_as_new_as(platform,"0.2.9.5-alpha")) { - if (msg) - *msg = "Tor version contains bug 20499. Please upgrade!"; + /* Check whether the version is obsolete, broken, insecure, etc... */ + if (platform && dirserv_rejects_tor_version(platform, msg)) { return FP_REJECT; } diff --git a/src/feature/dirauth/process_descs.h b/src/feature/dirauth/process_descs.h index 1d4085b09..0203cebfa 100644 --- a/src/feature/dirauth/process_descs.h +++ b/src/feature/dirauth/process_descs.h @@ -38,6 +38,8 @@ int dirserv_would_reject_router(const routerstatus_t *rs); #ifdef TOR_UNIT_TESTS STATIC int dirserv_router_has_valid_address(routerinfo_t *ri); +STATIC bool dirserv_rejects_tor_version(const char *platform, + const char **msg); #endif /* defined(TOR_UNIT_TESTS) */ #endif /* !defined(TOR_RECV_UPLOADS_H) */

1 0

[tor/master] Unit tests for dirserv_reject_tor_version().
by asn＠torproject.org 03 Oct '19

03 Oct '19

commit 49d6990cae0f6e7e636e320d0efcaec31b3c0453 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 29 11:45:41 2019 -0400 Unit tests for dirserv_reject_tor_version(). --- src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_process_descs.c | 67 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+) diff --git a/src/test/include.am b/src/test/include.am index 1e20f3f53..101e915cf 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -175,6 +175,7 @@ src_test_test_SOURCES += \ src/test/test_periodic_event.c \ src/test/test_policy.c \ src/test/test_process.c \ + src/test/test_process_descs.c \ src/test/test_prob_distr.c \ src/test/test_procmon.c \ src/test/test_proto_http.c \ diff --git a/src/test/test.c b/src/test/test.c index b9a1da06f..5f27f994f 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -858,6 +858,7 @@ struct testgroup_t testgroups[] = { { "crypto/pem/", pem_tests }, { "crypto/rng/", crypto_rng_tests }, { "dir/", dir_tests }, + { "dir/auth/process_descs/", process_descs_tests }, { "dir/md/", microdesc_tests }, { "dir/voting/flags/", voting_flags_tests }, { "dir/voting/schedule/", voting_schedule_tests }, diff --git a/src/test/test.h b/src/test/test.h index f5c21bfe8..d0b045a80 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -252,6 +252,7 @@ extern struct testcase_t prob_distr_tests[]; extern struct testcase_t slow_stochastic_prob_distr_tests[]; extern struct testcase_t procmon_tests[]; extern struct testcase_t process_tests[]; +extern struct testcase_t process_descs_tests[]; extern struct testcase_t proto_http_tests[]; extern struct testcase_t proto_misc_tests[]; extern struct testcase_t protover_tests[]; diff --git a/src/test/test_process_descs.c b/src/test/test_process_descs.c new file mode 100644 index 000000000..7dc9abde3 --- /dev/null +++ b/src/test/test_process_descs.c @@ -0,0 +1,67 @@ +/* Copyright (c) 2019, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "orconfig.h" + +#include "core/or/or.h" +#include "feature/dirauth/process_descs.h" + +#include "test/test.h" + +static void +test_process_descs_versions(void *arg) +{ + (void)arg; + struct { + const char *version; + bool should_reject; + } cases[] = { + // a very old version: reject. + { "Tor 0.1.2.3-alpha", true }, + // a non-tor program: don't reject. + { "Wombat 0.1.2.3-alpha", false }, + // a slightly old version: reject + { "Tor 0.2.9.4-alpha", true }, + // a slightly old version: just new enough to support. + { "Tor 0.2.9.5-alpha", false }, + // a newer 0.2.9 version: supported. + { "Tor 0.2.9.100", false }, + // some unsupported versions: reject. + { "Tor 0.3.0.0-alpha-dev", true }, + { "Tor 0.3.0.2-alpha", true }, + { "Tor 0.3.0.5", true }, + { "Tor 0.3.1.4", true }, + { "Tor 0.3.2.4", true }, + { "Tor 0.3.3.4", true }, + { "Tor 0.3.4.1-alpha", true }, + { "Tor 0.3.4.100", true }, + { "Tor 0.3.5.1-alpha", true }, + { "Tor 0.3.5.6-rc", true}, + // new enough to be supported + { "Tor 0.3.5.7", false }, + { "Tor 0.3.5.8", false }, + { "Tor 0.4.0.1-alpha", false }, + { "Tor 0.4.1.5", false }, + // Very far in the future + { "Tor 100.100.1.5", false }, + }; + size_t n_cases = ARRAY_LENGTH(cases); + + for (unsigned i = 0; i < n_cases; ++i) { + const char *msg = NULL; + bool rejected = dirserv_rejects_tor_version(cases[i].version, &msg); + tt_int_op(rejected, OP_EQ, cases[i].should_reject); + tt_int_op(msg == NULL, OP_EQ, rejected == false); + } + + done: + ; +} + +#define T(name,flags) \ + { #name, test_process_descs_##name, (flags), NULL, NULL } + +struct testcase_t process_descs_tests[] = { + T(versions,0), + END_OF_TESTCASES +};

1 0

[tor/master] Merge branch 'tor-github/pr/1276'
by asn＠torproject.org 03 Oct '19

03 Oct '19

commit 3778b97cabbf6f89694884c5f6b42dccb488df7f Merge: 065e467e7 49d6990ca Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Oct 3 19:13:02 2019 +0300 Merge branch 'tor-github/pr/1276' changes/ticket31549 | 4 +++ src/feature/dirauth/process_descs.c | 59 +++++++++++++++++++++++--------- src/feature/dirauth/process_descs.h | 2 ++ src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_process_descs.c | 67 +++++++++++++++++++++++++++++++++++++ 7 files changed, 119 insertions(+), 16 deletions(-)

1 0

[tor/master] bump to 0.4.2.2-alpha
by nickm＠torproject.org 03 Oct '19

03 Oct '19

commit 065e467e7cc78f25469f467d741c2d379fbbc246 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 3 12:07:50 2019 -0400 bump to 0.4.2.2-alpha --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index bd12e6167..e623b33ad 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.2.1-alpha-dev]) +AC_INIT([tor],[0.4.2.2-alpha]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2019-09-17"], # for 0.4.2.1-alpha-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-10-03"], # for 0.4.2.2-alpha [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 26387b03f..bdd112a08 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.2.1-alpha-dev" +!define VERSION "0.4.2.2-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index ac0513bc6..6bcd18ef6 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.2.1-alpha-dev" +#define VERSION "0.4.2.2-alpha"

1 0