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

[tor/master] addr: Validate identity key when getting a suggestion
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 9b2cadb492ee07ebb086b934b01ff8a5159fcc77 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jul 8 07:46:12 2020 -0400 addr: Validate identity key when getting a suggestion We do look at the address but with this we also look if the identity digest of the relay suggesting us an address is a trusted source. Related to #40022 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/core/or/channeltls.c | 3 ++- src/feature/relay/relay_find_addr.c | 9 ++++++--- src/feature/relay/relay_find_addr.h | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c index 9198a8bfb..4db373097 100644 --- a/src/core/or/channeltls.c +++ b/src/core/or/channeltls.c @@ -1934,7 +1934,8 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan) * we were unable to resolve it previously. The endpoint address is passed * in order to make sure to never consider an address that is the same as * our endpoint. */ - relay_address_new_suggestion(&my_apparent_addr, &chan->conn->real_addr); + relay_address_new_suggestion(&my_apparent_addr, &chan->conn->real_addr, + identity_digest); if (! chan->conn->handshake_state->sent_netinfo) { /* If we were prepared to authenticate, but we never got an AUTH_CHALLENGE diff --git a/src/feature/relay/relay_find_addr.c b/src/feature/relay/relay_find_addr.c index 699eb7e38..28b5985bb 100644 --- a/src/feature/relay/relay_find_addr.c +++ b/src/feature/relay/relay_find_addr.c @@ -55,12 +55,14 @@ router_guess_address_from_dir_headers(uint32_t *guess) * passes. */ void relay_address_new_suggestion(const tor_addr_t *suggested_addr, - const tor_addr_t *peer_addr) + const tor_addr_t *peer_addr, + const char *identity_digest) { const or_options_t *options = get_options(); tor_assert(suggested_addr); tor_assert(peer_addr); + tor_assert(identity_digest); /* This should never be called on a non Tor relay. */ if (BUG(!server_mode(options))) { @@ -68,8 +70,9 @@ relay_address_new_suggestion(const tor_addr_t *suggested_addr, } /* Is the peer a trusted source? Ignore anything coming from non trusted - * source. In this case, we only look at trusted authorities. */ - if (!router_addr_is_trusted_dir(peer_addr)) { + * source. In this case, we only look at trusted directory authorities. */ + if (!router_addr_is_trusted_dir(peer_addr) || + !router_digest_is_trusted_dir(identity_digest)) { return; } diff --git a/src/feature/relay/relay_find_addr.h b/src/feature/relay/relay_find_addr.h index d856e706e..6f298e6c7 100644 --- a/src/feature/relay/relay_find_addr.h +++ b/src/feature/relay/relay_find_addr.h @@ -16,7 +16,8 @@ void router_new_address_suggestion(const char *suggestion, const dir_connection_t *d_conn); void relay_address_new_suggestion(const tor_addr_t *suggested_addr, - const tor_addr_t *peer_addr); + const tor_addr_t *peer_addr, + const char *identity_digest); #ifdef RELAY_FIND_ADDR_PRIVATE

1 0

[tor/master] addr: Static assert resolved address cache size
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 7bc54ccba9b9a9ac2ee9f5c1ecccd1d13afbcdda Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 9 13:33:52 2020 -0400 addr: Static assert resolved address cache size This will make sure that we always properly initialize the cache by the exact size all the time. Related to #40022 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/app/config/resolve_addr.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c index 9e7c23c88..fb5cb2ed6 100644 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@ -42,15 +42,17 @@ typedef enum { } fn_address_ret_t; /** Last resolved addresses. */ -static tor_addr_t last_resolved_addrs[IDX_SIZE] = +static tor_addr_t last_resolved_addrs[] = { TOR_ADDR_NULL, TOR_ADDR_NULL, TOR_ADDR_NULL }; +CTASSERT(ARRAY_LENGTH(last_resolved_addrs) == IDX_SIZE); /** Last suggested addresses. * * These addresses come from a NETINFO cell from a trusted relay (currently * only authorities). We only use those in last resort. */ -static tor_addr_t last_suggested_addrs[IDX_SIZE] = +static tor_addr_t last_suggested_addrs[] = { TOR_ADDR_NULL, TOR_ADDR_NULL, TOR_ADDR_NULL }; +CTASSERT(ARRAY_LENGTH(last_suggested_addrs) == IDX_SIZE); static inline int af_to_idx(const int family) @@ -422,7 +424,9 @@ resolved_addr_set_last(const tor_addr_t *addr, const char *method_used, const char *hostname_used) { /** Have we done a first resolve. This is used to control logging. */ - static bool have_resolved_once[IDX_SIZE] = { false, false, false }; + static bool have_resolved_once[] = { false, false, false }; + CTASSERT(ARRAY_LENGTH(have_resolved_once) == IDX_SIZE); + bool *done_one_resolve; bool have_hostname = false; tor_addr_t *last_resolved;

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/21'
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 7207b4f2e4bb7d481b29855b432aa7265d79382b Merge: 97a9966b0 7bc54ccba Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 14:30:15 2020 -0400 Merge remote-tracking branch 'tor-gitlab/mr/21' changes/ticket40022 | 4 ++ src/app/config/resolve_addr.c | 49 +++++++++++-- src/app/config/resolve_addr.h | 5 ++ src/core/or/channeltls.c | 133 ++++++++++++++++++++++++++---------- src/feature/nodelist/dirlist.c | 28 ++++++++ src/feature/nodelist/dirlist.h | 5 ++ src/feature/relay/relay_find_addr.c | 57 ++++++++++++++++ src/feature/relay/relay_find_addr.h | 4 ++ 8 files changed, 241 insertions(+), 44 deletions(-) diff --cc src/app/config/resolve_addr.c index caca5a37d,fb5cb2ed6..172f69854 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@@ -370,64 -403,7 +403,64 @@@ get_address_from_interface(const or_opt 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. + /** @brief Set the last resolved address cache using the given address. * * A log notice is emitted if the given address has changed from before. Not * emitted on first resolve.

1 0

[tor/master] Update git scripts to include tor-gitlab repository
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 97a9966b04bde2f6a86dea0fb674db16442b2605 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 13:54:28 2020 -0400 Update git scripts to include tor-gitlab repository Analogously to tor-github, we now make a tor-gitlab repository. It is set up to disable push direct attempts, and to fetch merge requests into appropriate branches. git-pull-all.sh knows how to fetch this repository. --- scripts/git/git-pull-all.sh | 16 ++++++++++++++++ scripts/git/git-setup-dirs.sh | 31 +++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh index 7f82eda29..52a5c6140 100755 --- a/scripts/git/git-pull-all.sh +++ b/scripts/git/git-pull-all.sh @@ -181,6 +181,19 @@ function fetch_tor_github fi } +# Fetch tor-gitlab pull requests. No arguments. +function fetch_tor_gitlab +{ + local cmd="git fetch tor-gitlab" + printf " %s Fetching tor-gitlab..." "$MARKER" + if [ $DRY_RUN -eq 0 ]; then + msg=$( eval "$cmd" 2>&1 ) + validate_ret $? "$msg" + else + printf "\\n %s\\n" "${IWTH}$cmd${CNRM}" + fi +} + ############### # Entry point # ############### @@ -189,6 +202,9 @@ function fetch_tor_github goto_repo "$ORIGIN_PATH" fetch_tor_github +# Then tor-gitlab +fetch_tor_gitlab + # Then, fetch the origin. fetch_origin diff --git a/scripts/git/git-setup-dirs.sh b/scripts/git/git-setup-dirs.sh index 1f61eb8b8..3cc184daf 100755 --- a/scripts/git/git-setup-dirs.sh +++ b/scripts/git/git-setup-dirs.sh @@ -40,6 +40,10 @@ function usage() echo " (current: $GITHUB_PULL)" echo " TOR_GITHUB_PUSH: the tor-github remote push URL" echo " (current: $GITHUB_PUSH)" + echo " TOR_GITLAB_PULL: the tor-gitlab remote pull URL" + echo " (current: $GITLAB_PULL)" + echo " TOR_GITLAB_PUSH: the tor-gitlab remote push URL" + echo " (current: $GITLAB_PUSH)" echo " TOR_EXTRA_CLONE_ARGS: extra arguments to git clone" echo " (current: $TOR_EXTRA_CLONE_ARGS)" echo " TOR_EXTRA_REMOTE_NAME: the name of an extra remote" @@ -83,6 +87,10 @@ fi GITHUB_PULL=${TOR_GITHUB_PULL:-"https://github.com/torproject/tor.git"} GITHUB_PUSH=${TOR_GITHUB_PUSH:-"No_Pushing_To_GitHub"} +# GitLab repositories +GITLAB_PULL=${TOR_GITLAB_PULL:-"https://gitlab.torproject.org/tpo/core/tor.git"} +GITLAB_PUSH=${TOR_GITLAB_PUSH:-"No_Pushing_To_GitLab"} + ########################## # Git branches to manage # ########################## @@ -343,6 +351,20 @@ function set_tor_github_pr_fetch_config "refs/pull.*pr" } +# Set up the tor-github PR config, so tor-gitlab/mr/NNNN points to GitHub +# MR NNNN. In some repositories, "/head" is optional. +function set_tor_gitlab_mr_fetch_config +{ + # standard branches + replace_fetch_config tor-gitlab \ + "+refs/heads/*:refs/remotes/tor-gitlab/*" \ + "refs/heads" + # MRs + replace_fetch_config tor-gitlab \ + "+refs/merge-requests/*/head:refs/remotes/tor-gitlab/mr/*" \ + "refs/merge-requests.*mr" +} + # Add a new worktree for branch at path. # If the directory already exists: fail if $USE_EXISTING is 0, otherwise skip. function add_worktree @@ -471,6 +493,15 @@ set_tor_github_pr_fetch_config # Now fetch them all fetch_remote "tor-github" +# GitLab remote +printf "%s Seting up remote %s\\n" "$MARKER" "${BYEL}tor-gitlab${CNRM}" +add_remote "tor-gitlab" "$GITLAB_PULL" +set_remote_push "tor-gitlab" "$GITLAB_PUSH" +# Add custom fetch for MRs +set_tor_gitlab_mr_fetch_config +# Now fetch them all +fetch_remote "tor-gitlab" + # Extra remote if [ "$TOR_EXTRA_REMOTE_NAME" ]; then printf "%s Setting up remote %s\\n" "$MARKER" \

1 0

[community/master] Merge branch 'windows-bridge' of github.com:nicoleiocana/community into windows-bridge
by phw＠torproject.org 09 Jul '20

09 Jul '20

commit 7a69881b47c74f796806b153343129d51cfa7249 Merge: 6ce05bb ec8fbba Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Jul 9 10:58:52 2020 -0700 Merge branch 'windows-bridge' of github.com:nicoleiocana/community into windows-bridge .../technical-setup/bridge/windows/contents.lr | 107 +++++++++++++++++++++ 1 file changed, 107 insertions(+)

1 0

[community/master] Update link and add note at top
by phw＠torproject.org 09 Jul '20

09 Jul '20

commit ec8fbbacaac5aa9151e812aa2b2ca9f5e4fa58bc Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Thu Jul 2 19:41:08 2020 +0000 Update link and add note at top --- content/relay-operations/technical-setup/bridge/windows/contents.lr | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/windows/contents.lr b/content/relay-operations/technical-setup/bridge/windows/contents.lr index 6f1e088..8de2601 100644 --- a/content/relay-operations/technical-setup/bridge/windows/contents.lr +++ b/content/relay-operations/technical-setup/bridge/windows/contents.lr @@ -10,13 +10,15 @@ key: 10 --- body: +**Note: You should only run a Windows bridge if you can run it 24/7. If the operator is unable to guarantee that, a [Snowflake](https://snowflake.torproject.org/) is a better way to contribute resources.** + ### 1. Download the Windows Expert Bundle and the Tor Browser -* [Windows Expert Bundle](https://www.torproject.org/dist/torbrowser/9.0.10/tor-win32-0.4.2.7…. Unzip the contents on the desktop. +* [Windows Expert Bundle](https://www.torproject.org/download/tor/). Unzip the contents on the desktop. * [Tor Browser](https://www.torproject.org/download/#windows). Run the `.exe` and install with default settings. -**Note: You will need to show hidden items and file name extensions. In your Explorer window, in the top-left, click on the View tab. In the Show/hide section furthest to the right, check the checkbox for Hidden items; check the checkbox for File name extensions.** +You will need to show hidden items and file name extensions. In your Explorer window, in the top-left, click on the View tab. In the Show/hide section furthest to the right, check the checkbox for Hidden items; check the checkbox for File name extensions. ### 2. Build files and relocate

1 0

[community/master] Add bridge deploy for windows
by phw＠torproject.org 09 Jul '20

09 Jul '20

commit e51d8af9fa0628b1c58f0b96cb11d3878609188d Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Mon Jun 1 02:36:07 2020 +0000 Add bridge deploy for windows --- .../technical-setup/bridge/windows/contents.lr | 105 +++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/content/relay-operations/technical-setup/bridge/windows/contents.lr b/content/relay-operations/technical-setup/bridge/windows/contents.lr new file mode 100644 index 0000000..6f1e088 --- /dev/null +++ b/content/relay-operations/technical-setup/bridge/windows/contents.lr @@ -0,0 +1,105 @@ +_model: page +--- +color: primary +--- +title: Windows +--- +html: two-columns-page.html +--- +key: 10 +--- +body: + +### 1. Download the Windows Expert Bundle and the Tor Browser + +* [Windows Expert Bundle](https://www.torproject.org/dist/torbrowser/9.0.10/tor-win32-0.4.2.7…. Unzip the contents on the desktop. + +* [Tor Browser](https://www.torproject.org/download/#windows). Run the `.exe` and install with default settings. + +**Note: You will need to show hidden items and file name extensions. In your Explorer window, in the top-left, click on the View tab. In the Show/hide section furthest to the right, check the checkbox for Hidden items; check the checkbox for File name extensions.** + +### 2. Build files and relocate + +Open up the Tor folder on your desktop. Double click `tor.exe`. Once the command prompt reads: `[notice] Bootstrapped 100% (done): Done`, close the window. This creates the folder `C:\Users\<user>\AppData\Roaming\tor\` (where `<user>` is your user name). + +From the Tor folder on your desktop, select all `.dll`'s and `.exe`'s and cut/paste them into the `C:\Users\<user>\AppData\Roaming\tor\` folder. + +Open up the Data folder on your desktop. Inside that Tor folder, select both `geoip` and `geoip6` and cut/paste them into the `C:\Users\<user>\AppData\Roaming\tor\` folder. + +Navigate to `C:\Users\<user>\Desktop\Tor Browser\Browser\TorBrowser\Tor\PluggableTransports`. Select `obfs4proxy.exe` and cut/paste it into the `C:\Users\<user>\AppData\Roaming\tor\` folder. + +### 3. Create and edit your Tor config file + +In the `C:\Users\<user>\AppData\Roaming\tor\` folder, right-click on white space and select `New > Text Document`. Name the file `torrc`; there is no extension. + +Double-click on the `torrc` file. When prompted *How do you want to open this file?*, select `Notepad`. Add the following: + +``` +Log notice file C:\Users\<user>\AppData\Roaming\tor\notice.log +GeoIPFile C:\Users\<user>\AppData\Roaming\tor\geoip +GeoIPv6File C:\Users\<user>\AppData\Roaming\tor\geoip6 + +BridgeRelay 1 + +# Replace "TODO1" with a Tor port of your choice. +# This port must be externally reachable. +# Avoid port 9001 because it's commonly associated with Tor and censors may be scanning the Internet for this port. +ORPort TODO1 + +ServerTransportPlugin obfs4 exec C:\Users\<user>\AppData\Roaming\tor\obfs4proxy.exe + +# Replace "TODO2" with an obfs4 port of your choice. +# This port must be externally reachable and must be different from the one specified for ORPort. +# Avoid port 9001 because it's commonly associated with Tor and censors may be scanning the Internet for this port. +ServerTransportListenAddr obfs4 0.0.0.0:TODO2 + +# Local communication port between Tor and obfs4. Always set this to "auto". +# "Ext" means "extended", not "external". Don't try to set a specific port number, nor listen on 0.0.0.0. +ExtORPort auto + +# Replace "<address(a)email.com>" with your email address so we can contact you if there are problems with your bridge. +# This is optional but encouraged. +ContactInfo <address(a)email.com> + +# Pick a nickname that you like for your bridge. This is optional. +Nickname PickANickname +``` + +Don't forget to change the `ORPort`, `ServerTransportListenAddr`, `ContactInfo`, `<user>`, and `Nickname` options. + +* Use a fixed obfs4 port larger than 1024, still avoiding 9001. + +* Note that both Tor's OR port and its obfs4 port must be reachable. + If your bridge is behind a firewall or NAT, make sure to open both ports. + You can use [our reachability test](https://bridges.torproject.org/scan/) to see if your obfs4 port is reachable from the Internet. + +### 4. Start tor + +Open up the Command Prompt App. Change your directory with: `cd C:\Users\<user>\AppData\Roaming\tor\`. Type: `tor.exe -f torrc`. + +### 5. Monitor your logs + +To confirm your bridge is running with no issues, you should see something like this in `C:\Users\<user>\AppData\Roaming\tor\notice.log`. + +``` +[notice] Your Tor server's identity key fingerprint is '<NICKNAME> <FINGERPRINT>' +[notice] Your Tor bridge's hashed identity key fingerprint is '<NICKNAME> <HASHED FINGERPRINT>' +[notice] Registered server transport 'obfs4' at '[::]:46396' +[notice] Tor has successfully opened a circuit. Looks like client functionality is working. +[notice] Bootstrapped 100%: Done +[notice] Now checking whether ORPort <redacted>:3818 is reachable... (this may take up to 20 minutes -- look for log messages indicating success) +[notice] Self-testing indicates your ORPort is reachable from the outside. Excellent. Publishing server descriptor. +``` + +### 6. Final notes + +If you are having troubles setting up your bridge, have a look at [our help section](https://community.torproject.org/relay/getting-help/). If your bridge is now running, check out the [post-install notes](https://community.torproject.org/relay/setup/bridge/post-install/). + +--- +subtitle: How to deploy an obfs4 bridge on Windows +--- +_template: layout.html +--- +section: Bridge +--- +section_id: bridge

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit f9e5362ade10666fc6ee8ae9e2a9e7c25c6e3c73 Merge: f94575126 49b4d1765 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 13:15:59 2020 -0400 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

[tor/release-0.4.3] Bump to 0.3.5.11-dev
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit c9751e26119e375fcbc74107e89958957c00ee5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 13:12:45 2020 -0400 Bump to 0.3.5.11-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 24f1eeda3..f30a7efa9 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.3.5.11]) +AC_INIT([tor],[0.3.5.11-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index e4af442c0..638754153 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.3.5.11" +!define VERSION "0.3.5.11-dev" !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 521f54192..ec7a5b242 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.3.5.11" +#define VERSION "0.3.5.11-dev"

1 0

[tor/release-0.4.2] Bump to 0.4.2.8-dev
by nickm＠torproject.org 09 Jul '20

09 Jul '20

commit 49b4d1765c8595fbcfd23ba322cc454875ed1033 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 13:14:48 2020 -0400 Bump to 0.4.2.8-dev --- 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 8cd15c82e..af143e44a 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.8]) +AC_INIT([tor],[0.4.2.8-dev]) 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, ["2020-07-09"], # for 0.4.2.8 +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-07-09"], # for 0.4.2.8-dev [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 7a2ab0d63..ababaa38f 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.8" +!define VERSION "0.4.2.8-dev" !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 805fdaae2..38464f1c5 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.8" +#define VERSION "0.4.2.8-dev"

1 0