- tor-commits - lists.torproject.org

[tor/release-0.4.6] version: Bump to 0.4.5.11-dev
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit 00ff6dffa15fbdfbada975ead8ef3928f5cf6504 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 11:31:06 2021 -0400 version: Bump to 0.4.5.11-dev Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6bc86ddce7..c602d2c5c9 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.5.11]) +AC_INIT([tor],[0.4.5.11-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4])

1 0

[tor/release-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit d4af7bdb2616aaa73361a31b589c62548fc45700 Merge: 00ff6dffa1 66193ee708 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 11:31:14 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.5

1 0

[fallback-scripts/main] Update code to the latest arti
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit 2575c46bcd6983b8eea7a199f23de30197dd4329 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 10:59:06 2021 -0400 Update code to the latest arti Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- Cargo.toml | 11 ++++--- src/main.rs | 96 ++++++++++++++++++++++++++++------------------------------ src/onionoo.rs | 1 - 3 files changed, 53 insertions(+), 55 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f4077d2..d711781 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,18 +6,19 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -#[features] -#tokio = [ "tor-client/tokio", "tor-rtcompat/tokio" ] +[features] +default = [ "tokio" ] +tokio = [ "tor-rtcompat/tokio" ] [dependencies] anyhow = "1.0.38" chrono = "0.4" rand = "0.8.3" reqwest = { version = "0.11", features = ["json"] } -serde = { version = "1.0.124", features = ["derive"] } -tokio = { version = "1", features = ["full"] } +serde = { version = "1", features = ["derive"] } +tokio-crate = { package = "tokio", version = "1.7.0", features = ["rt", "rt-multi-thread", "io-util", "net", "time", "macros" ] } -tor-client = { git = "https://gitlab.torproject.org/tpo/core/arti.git", features = ["experimental-api"]} +arti-client = { git = "https://gitlab.torproject.org/tpo/core/arti.git", features = ["experimental-api"]} tor-dirmgr = { git = "https://gitlab.torproject.org/tpo/core/arti.git" } tor-netdir = { git = "https://gitlab.torproject.org/tpo/core/arti.git", features = ["experimental-api"] } tor-netdoc = { git = "https://gitlab.torproject.org/tpo/core/arti.git" } diff --git a/src/main.rs b/src/main.rs index c1802c2..52d1e8c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,19 +3,18 @@ use chrono::Utc; use rand::seq::SliceRandom; use std::fs::File; use std::io::{BufWriter, Write}; -use std::sync::Arc; +use tokio_crate as tokio; +use tor_rtcompat::tokio::TokioRuntimeHandle; -use tor_client; -use tor_dirmgr; +use arti_client::{self, TorClientConfig}; use tor_netdir; -use tor_netdoc::doc::netstatus::RouterFlags; +use tor_netdoc::doc::netstatus::RelayFlags; mod onionoo; // Header format from dir-list-spec.txt but static so Stem is happy about it. In the future, we // want to stop doing that. -static HEADER_COMMENT: &'static str = -"/* type=fallback */ +static HEADER_COMMENT: &'static str = "/* type=fallback */ /* version=4.0.0 */ /* timestamp=20210412000000 */ /* source=offer-list */"; @@ -64,7 +63,8 @@ fn write_file_tor_arti(writer: &mut BufWriter<&File>, relay: &tor_netdir::Relay) writeln!(writer, " &[")?; writeln!( writer, - "{: <12}{}", "", + "{: <12}{}", + "", relay .rs() .orport_addrs() @@ -93,57 +93,55 @@ fn write_header_to_file(writer: &mut BufWriter<&File>) -> Result<()> { Ok(()) } -fn main() -> Result<()> { - let mut builder = tor_dirmgr::NetDirConfigBuilder::new(); - builder.use_default_cache_path()?; - let config: tor_dirmgr::NetDirConfig = builder.finalize()?; +#[tokio::main] +async fn main() -> Result<()> { + let config = TorClientConfig::sane_defaults()?; + let rt: TokioRuntimeHandle = tokio_crate::runtime::Handle::current().into(); println!("[+] Fetching onionoo relays..."); - let onionoo_relays_fprs = onionoo::get_relay_fprs_from_onionoo()?; - - tor_rtcompat::task::block_on(async { - println!("[+] Bootstrapping to the Tor network..."); - let tor_client = Arc::new(tor_client::TorClient::bootstrap(config).await?); - let netdir = tor_client.dirmgr().netdir(); - - println!("[+] Cross-referencing relays between Onionoo and Tor consensus..."); - - let relays: Vec<_> = netdir - .relays() - .filter(|r| { - r.is_dir_cache() - && r.rs().flags().contains(RouterFlags::FAST) - && r.rs().flags().contains(RouterFlags::STABLE) - && onionoo_relays_fprs.contains(&r.rsa_id().to_string().to_uppercase()) - }) - .collect(); + let onionoo_relays_fprs = onionoo::get_relay_fprs_from_onionoo().await?; + + println!("[+] Bootstrapping to the Tor network..."); + let arti_client = arti_client::TorClient::bootstrap(rt, config).await?; + let netdir = arti_client.dirmgr().netdir(); + + println!("[+] Cross-referencing relays between Onionoo and Tor consensus..."); + + let relays: Vec<_> = netdir + .relays() + .filter(|r| { + r.is_dir_cache() + && r.rs().flags().contains(RelayFlags::FAST) + && r.rs().flags().contains(RelayFlags::STABLE) + && onionoo_relays_fprs.contains(&r.rsa_id().to_string().to_uppercase()) + }) + .collect(); - println!("Got {} relays. Randomly sampling 200...", relays.len()); + println!("Got {} relays. Randomly sampling 200...", relays.len()); - let picks = relays.choose_multiple(&mut rand::thread_rng(), 200); + let picks = relays.choose_multiple(&mut rand::thread_rng(), 200); - // Create files. - let tor_git_file = File::create("tor-git_fallback_dirs.inc")?; - let tor_arti_file = File::create("tor-arti_fallback_dirs.inc")?; + // Create files. + let tor_git_file = File::create("tor-git_fallback_dirs.inc")?; + let tor_arti_file = File::create("tor-arti_fallback_dirs.inc")?; - // Create writers. - let mut tor_git_writer = BufWriter::new(&tor_git_file); - let mut tor_arti_writer = BufWriter::new(&tor_arti_file); + // Create writers. + let mut tor_git_writer = BufWriter::new(&tor_git_file); + let mut tor_arti_writer = BufWriter::new(&tor_arti_file); - // Write header to both files. - write_header_to_file(&mut tor_git_writer)?; - write_header_to_file(&mut tor_arti_writer)?; + // Write header to both files. + write_header_to_file(&mut tor_git_writer)?; + write_header_to_file(&mut tor_arti_writer)?; - // Start the arti file. - writeln!(tor_arti_writer, "vec![")?; + // Start the arti file. + writeln!(tor_arti_writer, "vec![")?; - for relay in picks { - write_relay_to_files(&mut tor_git_writer, &mut tor_arti_writer, &relay)?; - } + for relay in picks { + write_relay_to_files(&mut tor_git_writer, &mut tor_arti_writer, &relay)?; + } - // End the arti file. - writeln!(tor_arti_writer, "]")?; + // End the arti file. + writeln!(tor_arti_writer, "]")?; - Ok(()) - }) + Ok(()) } diff --git a/src/onionoo.rs b/src/onionoo.rs index c1d028e..96ac051 100644 --- a/src/onionoo.rs +++ b/src/onionoo.rs @@ -14,7 +14,6 @@ pub struct OnionooRelay { /// Search onionoo and return a vector of fingerprint strings corresponding to /// the stablest relays -#[tokio::main] pub async fn get_relay_fprs_from_onionoo() -> Result<Vec<String>, Error> { // Query URL found in the old fallbackdir scripts let request_url = format!("https://onionoo.torproject.org/details?fields=fingerprint%2Cnickname%2Ccont…");

1 0

[tpo/master] Merge branch 'update-tor-people'
by gus＠torproject.org 26 Oct '21

26 Oct '21

commit ff1e65b1c2eca602d0f197fce83e111ad35acfdd Merge: 850c1342 aeae5dbc Author: gus <gus(a)torproject.org> Date: Tue Oct 26 11:29:04 2021 -0300 Merge branch 'update-tor-people' content/about/people/amoghbl1/contents.lr | 17 ----------------- content/about/people/moritz/contents.lr | 17 ----------------- content/about/people/sisbell/contents.lr | 17 ----------------- content/about/people/stephw/contents.lr | 21 --------------------- 4 files changed, 72 deletions(-)

1 0

[tpo/master] i #228: Remove some people from about/people
by gus＠torproject.org 26 Oct '21

26 Oct '21

commit aeae5dbc8eb6f743ef04fd1dc386bea9906bafe4 Author: HackerNCoder <hackerncoder(a)encryptionin.space> Date: Sat Oct 23 18:28:32 2021 +0000 i #228: Remove some people from about/people --- content/about/people/amoghbl1/contents.lr | 17 ----------------- content/about/people/moritz/contents.lr | 17 ----------------- content/about/people/sisbell/contents.lr | 17 ----------------- content/about/people/stephw/contents.lr | 21 --------------------- 4 files changed, 72 deletions(-) diff --git a/content/about/people/amoghbl1/contents.lr b/content/about/people/amoghbl1/contents.lr deleted file mode 100644 index 2a32fafa..00000000 --- a/content/about/people/amoghbl1/contents.lr +++ /dev/null @@ -1,17 +0,0 @@ -_model: person ---- -_hidden: yes ---- -role:core ---- -name: Amogh Pradeep ---- -twitter_handle: amoghbl1 ---- -nickname: amoghbl1 ---- -image: /static/images/people/amoghbl1.png ---- -description: - -[Lead developer](http://amoghbl1.com/) of Orfox and contributor to Orbot diff --git a/content/about/people/moritz/contents.lr b/content/about/people/moritz/contents.lr deleted file mode 100644 index 79d4fb7e..00000000 --- a/content/about/people/moritz/contents.lr +++ /dev/null @@ -1,17 +0,0 @@ -_model: person ---- -_hidden: yes ---- -role:core ---- -name: Moritz Bartl ---- -gpg: /static/keys/moritz.txt ---- -image: /static/images/people/moritz.png ---- -twitter_handle: gamamb ---- -description: - -Co-founder of [torservers.net](https://www.torservers.net/), a network of non-profit organizations that run Tor exit relays. diff --git a/content/about/people/sisbell/contents.lr b/content/about/people/sisbell/contents.lr deleted file mode 100644 index 2f95fd97..00000000 --- a/content/about/people/sisbell/contents.lr +++ /dev/null @@ -1,17 +0,0 @@ -_model: person ---- -_hidden: yes ---- -role:core ---- -name: Shane Isbell ---- -nickname: sisbell ---- -pronoun: he ---- -twitter_handle: sisbell ---- -description: - -Works on Tor Browser for Android. diff --git a/content/about/people/stephw/contents.lr b/content/about/people/stephw/contents.lr deleted file mode 100644 index cae06da6..00000000 --- a/content/about/people/stephw/contents.lr +++ /dev/null @@ -1,21 +0,0 @@ -_model: person ---- -_hidden: yes ---- -role:core ---- -name: Stephanie Whited ---- -nickname: stephw ---- -pronoun: she ---- -twitter_handle: walnutwordsalad ---- -gpg: /static/keys/stephw.txt ---- -image: /static/images/people/stephw.png ---- -description: - -Directs communications.

1 0

[tor/main] Merge branch 'maint-0.4.5' into maint-0.4.6
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit fadb57e853d5f3960e67e27092350b4047acacd7 Merge: a647c26a6b 6f776001cb Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 09:17:58 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6

1 0

[tor/main] version: Bump to 0.4.6.8
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit a647c26a6bfa27a68f228deac022247655364f1e Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 09:17:01 2021 -0400 version: Bump to 0.4.6.8 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- 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 1a5a7a7003..43f9f475db 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.6.7-dev]) +AC_INIT([tor],[0.4.6.8]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], [Flags passed to config # 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, ["2021-08-16"], # for 0.4.6.7 +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.6.8 [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 3dd470100f..c59769cdb8 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.6.7" +!define VERSION "0.4.6.8" !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 cc70a3ab19..ac4a8e31b2 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.6.7" +#define VERSION "0.4.6.8" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/main] version: Bump to 0.3.5.17
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit 9280f32fc0e4ab61b6cd06a640d285188f845106 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 09:16:13 2021 -0400 version: Bump to 0.3.5.17 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- 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 e698bf8901..855eb6441a 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.16-dev]) +AC_INIT([tor],[0.3.5.17]) 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 c8695bc86c..7a6566a2c3 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.16" +!define VERSION "0.3.5.17" !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 273806fde3..f32c725b07 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.16" +#define VERSION "0.3.5.17"

1 0

[tor/main] Merge branch 'maint-0.3.5' into maint-0.4.5
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit 6f776001cb95c0ad498ebbe8665f74260d135dd9 Merge: 446135aff0 9280f32fc0 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 09:17:52 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.5

1 0

[tor/main] version: Bump to 0.4.7.2-alpha
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit 4e921f5b8856af5cfcd41a9e16753697539d4b9e Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 09:23:35 2021 -0400 version: Bump to 0.4.7.2-alpha Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 85b23f24f9..6a9bee1658 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.7.1-alpha]) +AC_INIT([tor],[0.4.7.2-alpha]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4])

1 0