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

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 12 Nov '19

12 Nov '19

commit f6b6171ed01d355dee59a2ba0d54736bf6678259 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 12 22:50:10 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+ka.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index 924d55820..26364d0e9 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -74,7 +74,7 @@ msgstr "Tor-ბრაუზერის შესახებ" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Downloading" -msgstr "ჩამოიტვირთება" +msgstr "ჩამოტვირთვა" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -270,7 +270,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.title) msgid "DOWNLOADING" -msgstr "ჩამოიტვირთება" +msgstr "ჩამოტვირთვა" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.description) @@ -506,8 +506,7 @@ msgid "" "and change the permission to allow executing file as program." msgstr "" "მარჯვენა ღილაკით დაწკაპეთ `start-tor-browser.desktop`, გახსენით პარამეტრები " -"ან მახასიათებლები და შეცვალეთ დაუშვით ფაილის პროგრამის სახით გაშვების " -"ნებართვა." +"ან მახასიათებლები და დაუშვით ფაილის პროგრამის სახით გაშვების ნებართვა." #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body)

1 0

[tor/master] Remove changes files that are already merged into 0.4.2.4-rc.
by nickm＠torproject.org 12 Nov '19

12 Nov '19

commit 79bac442933cea2d3e7051feace72b31c5cc5be7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 12 16:48:12 2019 -0500 Remove changes files that are already merged into 0.4.2.4-rc. --- changes/bug31335 | 3 --- changes/bug32106 | 5 ----- changes/bug32108 | 8 -------- changes/bug32402 | 3 --- changes/bug32402_git_scripts | 3 --- changes/bug32449 | 5 ----- changes/geoip-2019-11-06 | 4 ---- changes/ticket28970 | 6 ------ changes/ticket31919_bionic | 5 ----- changes/ticket31958 | 5 ----- changes/ticket32191 | 3 --- changes/ticket32241 | 2 -- changes/ticket32407 | 4 ---- 13 files changed, 56 deletions(-) diff --git a/changes/bug31335 b/changes/bug31335 deleted file mode 100644 index f633cf8b2..000000000 --- a/changes/bug31335 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (code quality): - - Fix "make check-includes" so it runs correctly on out-of-tree builds. - Fixes bug 31335; bugfix on 0.3.5.1-alpha. diff --git a/changes/bug32106 b/changes/bug32106 deleted file mode 100644 index c6e8e9586..000000000 --- a/changes/bug32106 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features (documentation): - - Make clear in the man page, in both the bandwidth section and the - accountingmax section, that Tor counts in powers of two, not - powers of ten: 1 GByte is 1024*1024*1024 bytes, not one billion - bytes. Resolves ticket 32106. diff --git a/changes/bug32108 b/changes/bug32108 deleted file mode 100644 index 2806fa3e5..000000000 --- a/changes/bug32108 +++ /dev/null @@ -1,8 +0,0 @@ - o Major bugfixes (relay): - - Relays now respect their AccountingMax bandwidth again. When relays - entered "soft" hibernation (which typically starts when we've hit - 90% of our AccountingMax), we had stopped checking whether we should - enter hard hibernation. Soft hibernation refuses new connections and - new circuits, but the existing circuits can continue, meaning that - relays could have exceeded their configured AccountingMax. Fixes - bug 32108; bugfix on 0.4.0.1-alpha. diff --git a/changes/bug32402 b/changes/bug32402 deleted file mode 100644 index 0654389be..000000000 --- a/changes/bug32402 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (shellcheck): - - Start checking most scripts for shellcheck errors again. - Fixes bug 32402; bugfix on 0.4.2.1-alpha. diff --git a/changes/bug32402_git_scripts b/changes/bug32402_git_scripts deleted file mode 100644 index 2b10a8998..000000000 --- a/changes/bug32402_git_scripts +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (shellcheck): - - Fix minor shellcheck errors in the git-*.sh scripts. - Fixes bug 32402; bugfix on 0.4.2.1-alpha. diff --git a/changes/bug32449 b/changes/bug32449 deleted file mode 100644 index 213d8a101..000000000 --- a/changes/bug32449 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (CI, appveyor): - - Install the mingw OpenSSL package in Appveyor. This makes sure that - the OpenSSL headers and libraries match in Tor's Appveyor builds. - (This bug was triggered by an Appveyor image update.) - Fixes bug 32449; bugfix on 0.3.5.6-rc. diff --git a/changes/geoip-2019-11-06 b/changes/geoip-2019-11-06 deleted file mode 100644 index a47098101..000000000 --- a/changes/geoip-2019-11-06 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (geoip): - - Update geoip and geoip6 to the November 6 2019 Maxmind GeoLite2 - Country database. Closes ticket 32440. - diff --git a/changes/ticket28970 b/changes/ticket28970 deleted file mode 100644 index 138c575fc..000000000 --- a/changes/ticket28970 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes (clietn, hidden service v3): - - Fix a BUG() assertion that occurs within a very small race window between - a client intro circuit opens and its descriptor that gets cleaned up from - the cache. The circuit is now closed which will trigger a re-fetch of the - descriptor and continue the HS connection. Fixes bug 28970; bugfix on - 0.3.2.1-alpha. diff --git a/changes/ticket31919_bionic b/changes/ticket31919_bionic deleted file mode 100644 index eb4164455..000000000 --- a/changes/ticket31919_bionic +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features (continuous integration): - - Use Ubuntu Bionic images for our Travis CI builds, so we can get - a recent version of coccinelle. But leave chutney on Ubuntu Trusty, - until we can fix some Bionic permissions issues (see ticket 32240). - Related to ticket 31919. diff --git a/changes/ticket31958 b/changes/ticket31958 deleted file mode 100644 index 8206064df..000000000 --- a/changes/ticket31958 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (directory): - - When checking if a directory connection is anonymous, test if the circuit - was marked for close before looking at its channel. This avoids a BUG() - stacktrace in case it was previously closed. Fixes bug 31958; bugfix on - 0.4.2.1-alpha. diff --git a/changes/ticket32191 b/changes/ticket32191 deleted file mode 100644 index 698832811..000000000 --- a/changes/ticket32191 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features (build system): - - Make pkg-config use --prefix when cross-compiling, if PKG_CONFIG_PATH - is not set. Closes ticket 32191. diff --git a/changes/ticket32241 b/changes/ticket32241 deleted file mode 100644 index 4243cec17..000000000 --- a/changes/ticket32241 +++ /dev/null @@ -1,2 +0,0 @@ - o Testing (continuous integration): - - In Travis, use Xcode 11.2 on macOS 10.14. Closes ticket 32241. diff --git a/changes/ticket32407 b/changes/ticket32407 deleted file mode 100644 index badb09abf..000000000 --- a/changes/ticket32407 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (crash): - - When running Tor with an option like --verify-config or --dump-config - that does not start the event loop, avoid crashing if we try to exit - early because of an error. Fixes bug 32407; bugfix on 0.3.3.1-alpha.

1 0

[tor/release-0.4.2] start changelog for 0.4.2.4-rc.
by nickm＠torproject.org 12 Nov '19

12 Nov '19

commit 1d969af11b7bcf346e2fc0820978f03cf808c54a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 12 16:42:31 2019 -0500 start changelog for 0.4.2.4-rc. --- ChangeLog | 61 ++++++++++++++++++++++++++++++++++++++++++++ changes/bug31335 | 3 --- changes/bug32295 | 3 --- changes/bug32402 | 3 --- changes/bug32402_git_scripts | 3 --- changes/bug32449 | 5 ---- changes/geoip-2019-11-06 | 4 --- changes/ticket28970 | 6 ----- changes/ticket31919_bionic | 5 ---- changes/ticket31958 | 5 ---- changes/ticket32191 | 3 --- changes/ticket32241 | 2 -- changes/ticket32407 | 4 --- 13 files changed, 61 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index 594f11ff9..481fca074 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,64 @@ +Changes in version 0.4.2.4-rc - 2019-11-?? + Tor 0.4.2.4-rc is the first release candidate in its series; it fixes + several bugs from earlier versions. + + o Minor features (build system): + - Make pkg-config use --prefix when cross-compiling, if + PKG_CONFIG_PATH is not set. Closes ticket 32191. + + o Minor features (continuous integration): + - Use Ubuntu Bionic images for our Travis CI builds, so we can get a + recent version of coccinelle. But leave chutney on Ubuntu Trusty, + until we can fix some Bionic permissions issues (see ticket + 32240). Related to ticket 31919. + + o Minor features (geoip): + - Update geoip and geoip6 to the November 6 2019 Maxmind GeoLite2 + Country database. Closes ticket 32440. + + o Minor bugfixes (CI, appveyor): + - Install the mingw OpenSSL package in Appveyor. This makes sure + that the OpenSSL headers and libraries match in Tor's Appveyor + builds. (This bug was triggered by an Appveyor image update.) + Fixes bug 32449; bugfix on 0.3.5.6-rc. + + o Minor bugfixes (clietn, hidden service v3): + - Fix a BUG() assertion that occurs within a very small race window + between a client intro circuit opens and its descriptor that gets + cleaned up from the cache. The circuit is now closed which will + trigger a re-fetch of the descriptor and continue the HS + connection. Fixes bug 28970; bugfix on 0.3.2.1-alpha. + + o Minor bugfixes (code quality): + - Fix "make check-includes" so it runs correctly on out-of-tree + builds. Fixes bug 31335; bugfix on 0.3.5.1-alpha. + + o Minor bugfixes (configuration): + - Log the option name when skipping an obsolete option. Fixes bug + 32295; bugfix on 0.4.2.1-alpha. + + o Minor bugfixes (crash): + - When running Tor with an option like --verify-config or + --dump-config that does not start the event loop, avoid crashing + if we try to exit early because of an error. Fixes bug 32407; + bugfix on 0.3.3.1-alpha. + + o Minor bugfixes (directory): + - When checking if a directory connection is anonymous, test if the + circuit was marked for close before looking at its channel. This + avoids a BUG() stacktrace in case it was previously closed. Fixes + bug 31958; bugfix on 0.4.2.1-alpha. + + o Minor bugfixes (shellcheck): + - Fix minor shellcheck errors in the git-*.sh scripts. Fixes bug + 32402; bugfix on 0.4.2.1-alpha. + - Start checking most scripts for shellcheck errors again. Fixes bug + 32402; bugfix on 0.4.2.1-alpha. + + o Testing (continuous integration): + - In Travis, use Xcode 11.2 on macOS 10.14. Closes ticket 32241. + + Changes in version 0.4.2.3-alpha - 2019-10-24 This release fixes several bugs from the previous alpha release, and from earlier versions of Tor. diff --git a/changes/bug31335 b/changes/bug31335 deleted file mode 100644 index f633cf8b2..000000000 --- a/changes/bug31335 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (code quality): - - Fix "make check-includes" so it runs correctly on out-of-tree builds. - Fixes bug 31335; bugfix on 0.3.5.1-alpha. diff --git a/changes/bug32295 b/changes/bug32295 deleted file mode 100644 index e5e5a4399..000000000 --- a/changes/bug32295 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (configuration): - - Log the option name when skipping an obsolete option. - Fixes bug 32295; bugfix on 0.4.2.1-alpha. diff --git a/changes/bug32402 b/changes/bug32402 deleted file mode 100644 index 0654389be..000000000 --- a/changes/bug32402 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (shellcheck): - - Start checking most scripts for shellcheck errors again. - Fixes bug 32402; bugfix on 0.4.2.1-alpha. diff --git a/changes/bug32402_git_scripts b/changes/bug32402_git_scripts deleted file mode 100644 index 2b10a8998..000000000 --- a/changes/bug32402_git_scripts +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (shellcheck): - - Fix minor shellcheck errors in the git-*.sh scripts. - Fixes bug 32402; bugfix on 0.4.2.1-alpha. diff --git a/changes/bug32449 b/changes/bug32449 deleted file mode 100644 index 213d8a101..000000000 --- a/changes/bug32449 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (CI, appveyor): - - Install the mingw OpenSSL package in Appveyor. This makes sure that - the OpenSSL headers and libraries match in Tor's Appveyor builds. - (This bug was triggered by an Appveyor image update.) - Fixes bug 32449; bugfix on 0.3.5.6-rc. diff --git a/changes/geoip-2019-11-06 b/changes/geoip-2019-11-06 deleted file mode 100644 index a47098101..000000000 --- a/changes/geoip-2019-11-06 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (geoip): - - Update geoip and geoip6 to the November 6 2019 Maxmind GeoLite2 - Country database. Closes ticket 32440. - diff --git a/changes/ticket28970 b/changes/ticket28970 deleted file mode 100644 index 138c575fc..000000000 --- a/changes/ticket28970 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes (clietn, hidden service v3): - - Fix a BUG() assertion that occurs within a very small race window between - a client intro circuit opens and its descriptor that gets cleaned up from - the cache. The circuit is now closed which will trigger a re-fetch of the - descriptor and continue the HS connection. Fixes bug 28970; bugfix on - 0.3.2.1-alpha. diff --git a/changes/ticket31919_bionic b/changes/ticket31919_bionic deleted file mode 100644 index eb4164455..000000000 --- a/changes/ticket31919_bionic +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features (continuous integration): - - Use Ubuntu Bionic images for our Travis CI builds, so we can get - a recent version of coccinelle. But leave chutney on Ubuntu Trusty, - until we can fix some Bionic permissions issues (see ticket 32240). - Related to ticket 31919. diff --git a/changes/ticket31958 b/changes/ticket31958 deleted file mode 100644 index 8206064df..000000000 --- a/changes/ticket31958 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (directory): - - When checking if a directory connection is anonymous, test if the circuit - was marked for close before looking at its channel. This avoids a BUG() - stacktrace in case it was previously closed. Fixes bug 31958; bugfix on - 0.4.2.1-alpha. diff --git a/changes/ticket32191 b/changes/ticket32191 deleted file mode 100644 index 698832811..000000000 --- a/changes/ticket32191 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features (build system): - - Make pkg-config use --prefix when cross-compiling, if PKG_CONFIG_PATH - is not set. Closes ticket 32191. diff --git a/changes/ticket32241 b/changes/ticket32241 deleted file mode 100644 index 4243cec17..000000000 --- a/changes/ticket32241 +++ /dev/null @@ -1,2 +0,0 @@ - o Testing (continuous integration): - - In Travis, use Xcode 11.2 on macOS 10.14. Closes ticket 32241. diff --git a/changes/ticket32407 b/changes/ticket32407 deleted file mode 100644 index badb09abf..000000000 --- a/changes/ticket32407 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (crash): - - When running Tor with an option like --verify-config or --dump-config - that does not start the event loop, avoid crashing if we try to exit - early because of an error. Fixes bug 32407; bugfix on 0.3.3.1-alpha.

1 0

[tor/release-0.4.2] Minor edits and sorting on 0.4.2.4-rc changelog
by nickm＠torproject.org 12 Nov '19

12 Nov '19

commit e3e25c09b7379d48829844dd6b98f19268851ec6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 12 16:46:14 2019 -0500 Minor edits and sorting on 0.4.2.4-rc changelog --- ChangeLog | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 481fca074..a27be04d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,27 +6,15 @@ Changes in version 0.4.2.4-rc - 2019-11-?? - Make pkg-config use --prefix when cross-compiling, if PKG_CONFIG_PATH is not set. Closes ticket 32191. - o Minor features (continuous integration): - - Use Ubuntu Bionic images for our Travis CI builds, so we can get a - recent version of coccinelle. But leave chutney on Ubuntu Trusty, - until we can fix some Bionic permissions issues (see ticket - 32240). Related to ticket 31919. - o Minor features (geoip): - Update geoip and geoip6 to the November 6 2019 Maxmind GeoLite2 Country database. Closes ticket 32440. - o Minor bugfixes (CI, appveyor): - - Install the mingw OpenSSL package in Appveyor. This makes sure - that the OpenSSL headers and libraries match in Tor's Appveyor - builds. (This bug was triggered by an Appveyor image update.) - Fixes bug 32449; bugfix on 0.3.5.6-rc. - - o Minor bugfixes (clietn, hidden service v3): + o Minor bugfixes (client, onion service v3): - Fix a BUG() assertion that occurs within a very small race window - between a client intro circuit opens and its descriptor that gets - cleaned up from the cache. The circuit is now closed which will - trigger a re-fetch of the descriptor and continue the HS + between when a client intro circuit opens and when its descriptor + gets cleaned up from the cache. The circuit is now closed early, + which will trigger a re-fetch of the descriptor and continue the connection. Fixes bug 28970; bugfix on 0.3.2.1-alpha. o Minor bugfixes (code quality): @@ -46,8 +34,8 @@ Changes in version 0.4.2.4-rc - 2019-11-?? o Minor bugfixes (directory): - When checking if a directory connection is anonymous, test if the circuit was marked for close before looking at its channel. This - avoids a BUG() stacktrace in case it was previously closed. Fixes - bug 31958; bugfix on 0.4.2.1-alpha. + avoids a BUG() stacktrace if the circuit was previously closed. + Fixes bug 31958; bugfix on 0.4.2.1-alpha. o Minor bugfixes (shellcheck): - Fix minor shellcheck errors in the git-*.sh scripts. Fixes bug @@ -56,6 +44,14 @@ Changes in version 0.4.2.4-rc - 2019-11-?? 32402; bugfix on 0.4.2.1-alpha. o Testing (continuous integration): + - Use Ubuntu Bionic images for our Travis CI builds, so we can get a + recent version of coccinelle. But leave chutney on Ubuntu Trusty, + until we can fix some Bionic permissions issues (see ticket + 32240). Related to ticket 31919. + - Install the mingw OpenSSL package in Appveyor. This makes sure + that the OpenSSL headers and libraries match in Tor's Appveyor + builds. (This bug was triggered by an Appveyor image update.) + Fixes bug 32449; bugfix on 0.3.5.6-rc. - In Travis, use Xcode 11.2 on macOS 10.14. Closes ticket 32241.

1 0

[tor/release-0.4.2] more blurb for 0.4.2.4-rc changelog.
by nickm＠torproject.org 12 Nov '19

12 Nov '19

commit 086b81cb08d50c40f65982675982ae5798896831 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 12 16:46:54 2019 -0500 more blurb for 0.4.2.4-rc changelog. --- ChangeLog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a27be04d7..cc97a3e28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ Changes in version 0.4.2.4-rc - 2019-11-?? - Tor 0.4.2.4-rc is the first release candidate in its series; it fixes - several bugs from earlier versions. + Tor 0.4.2.4-rc is the first release candidate in its series. It fixes + several bugs from earlier versions, including a few that would result in + stack traces or incorrect behavior. o Minor features (build system): - Make pkg-config use --prefix when cross-compiling, if

1 0

[tor/master] Bump version to 0.4.2.4-rc.
by nickm＠torproject.org 12 Nov '19

12 Nov '19

commit 70755eca00a97e818be0ef07e2fa31ffc3c87d7d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 12 16:39:37 2019 -0500 Bump version to 0.4.2.4-rc. --- 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 caa2d2f7c..6d7e7f4fe 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.3-alpha-dev]) +AC_INIT([tor],[0.4.2.4-rc]) 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-10-24"], # for 0.4.2.3-alpha-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-11-12"], # for 0.4.2.4-rc [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 63927ef79..1a533dffe 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.3-alpha-dev" +!define VERSION "0.4.2.4-rc" !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 bd38e7208..3d6a24ca5 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.3-alpha-dev" +#define VERSION "0.4.2.4-rc"

1 0

[tor/maint-0.4.2] Bump version to 0.4.2.4-rc.
by nickm＠torproject.org 12 Nov '19

12 Nov '19

commit 70755eca00a97e818be0ef07e2fa31ffc3c87d7d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 12 16:39:37 2019 -0500 Bump version to 0.4.2.4-rc. --- 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 caa2d2f7c..6d7e7f4fe 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.3-alpha-dev]) +AC_INIT([tor],[0.4.2.4-rc]) 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-10-24"], # for 0.4.2.3-alpha-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-11-12"], # for 0.4.2.4-rc [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 63927ef79..1a533dffe 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.3-alpha-dev" +!define VERSION "0.4.2.4-rc" !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 bd38e7208..3d6a24ca5 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.3-alpha-dev" +#define VERSION "0.4.2.4-rc"

1 0

[tor/master] Merge branch 'maint-0.4.2'
by nickm＠torproject.org 12 Nov '19

12 Nov '19

commit cd4ae97448ea503111d6f235624a4594f7ff3470 Merge: fc1316b55 70755eca0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 12 16:39:44 2019 -0500 Merge branch 'maint-0.4.2' "ours" to avoid version bump.

1 0

[tor/release-0.4.2] Bump version to 0.4.2.4-rc.
by nickm＠torproject.org 12 Nov '19

12 Nov '19

commit 70755eca00a97e818be0ef07e2fa31ffc3c87d7d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 12 16:39:37 2019 -0500 Bump version to 0.4.2.4-rc. --- 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 caa2d2f7c..6d7e7f4fe 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.3-alpha-dev]) +AC_INIT([tor],[0.4.2.4-rc]) 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-10-24"], # for 0.4.2.3-alpha-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-11-12"], # for 0.4.2.4-rc [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 63927ef79..1a533dffe 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.3-alpha-dev" +!define VERSION "0.4.2.4-rc" !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 bd38e7208..3d6a24ca5 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.3-alpha-dev" +#define VERSION "0.4.2.4-rc"

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by nickm＠torproject.org 12 Nov '19

12 Nov '19

commit 9eef1d680cec9c87170aeebca023349eea55a0d3 Merge: 0cfb7f6ce 70755eca0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 12 16:40:00 2019 -0500 Merge branch 'maint-0.4.2' into release-0.4.2 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0