August 2018 - tor-commits - lists.torproject.org

[webwml/master] docs/debian: mention apt-transport-tor ; unhide onion address
by hiro＠torproject.org 22 Aug '18

22 Aug '18

commit 5ad79e06d1c9ef4934086fbf816249035eba9fb2 Author: Traumschule <traumschule(a)riseup.net> Date: Sat Aug 11 17:18:04 2018 +0200 docs/debian: mention apt-transport-tor ; unhide onion address --- docs/en/debian.wml | 101 +++++++++++++++++++++++++---------------------------- 1 file changed, 48 insertions(+), 53 deletions(-) diff --git a/docs/en/debian.wml b/docs/en/debian.wml index e93c8401..b4008f33 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -87,13 +87,14 @@ version <div id="apt-source"> -You need to add the following entry in <code>/etc/apt/sources.list</code> or a new file in <code>/etc/apt/sources.list.d/</code>: +You need to add the following entries to <code>/etc/apt/sources.list</code> or a new file in +<code>/etc/apt/sources.list.d/</code>: <blockquote><pre id="sources">deb https://deb.torproject.org/torproject.org jessie main </pre></blockquote> </div> -Note: To use this source line in /etc/apt/sources.list The <a +Note: To use source lines with https:// in /etc/apt/sources.list the <a href="https://packages.debian.org/stretch/apt-transport-https">apt-transport-https package</a> is required. Install it with <blockquote><pre> @@ -101,6 +102,12 @@ apt install apt-transport-https </pre></blockquote> to enable the usage of 'deb https://foo distro main' lines in the /etc/apt/sources.list so that all package managers using the libapt-pkg library can access metadata and packages available in sources accessible over https (Hypertext Transfer Protocol Secure). +To use Apt with Tor later replace <tt>https://</tt> with <tt>tor://</tt> and run +<blockquote><pre> +apt install apt-transport-tor +</pre></blockquote> + + <div id="sig"> Then add the gpg key used to sign the packages by running the following commands at your command prompt: <blockquote><pre> @@ -112,15 +119,13 @@ gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - <div id="apt-get"> You can install it with the following commands: -<blockquote><pre>$ apt update -$ apt install tor deb.torproject.org-keyring +<blockquote><pre>apt update +apt install tor deb.torproject.org-keyring $ apt install build-essential fakeroot devscripts $ apt build-dep tor deb.torproject.org-keyring</pre></blockquote> <div id="source-install2"> - -Then you can build Tor in ~/debian-packages: - +Then you can build Tor in ~/debian-packages: <blockquote><pre> $ mkdir ~/debian-packages; cd ~/debian-packages $ apt source tor @@ -150,6 +155,30 @@ in place of <DISTRIBUTION>. +If you want to use the <a href="<page download/download-unix>#packagediff">development branch</a> of Tor +instead (more features and more bugs), you need add a different set of lines to your +/etc/apt/sources.list file: +<pre style="margin: 1.5em 0 1.5em 2em"> +deb https://deb.torproject.org/torproject.org <DISTRIBUTION> main +deb https://deb.torproject.org/torproject.org tor-experimental-0.3.4.x-<DISTRIBUTION> main +</pre> + + +Note: To use source lines with <tt>https://</tt> in /etc/apt/sources.list the <a +href="https://packages.debian.org/stretch/apt-transport-https">apt-transport-https +package</a> is required. Install it with +<blockquote><pre> +apt install apt-transport-https +</pre></blockquote> +to enable the usage of 'deb https://foo distro main' lines in the /etc/apt/sources.list so that all package managers using the libapt-pkg library can access metadata and packages available in sources accessible over https (Hypertext Transfer Protocol Secure). + +To use Apt with Tor later replace <tt>https://</tt> with <tt>tor://</tt> and run +<blockquote><pre> +apt install apt-transport-tor +</pre></blockquote> + + + Then add the gpg key used to sign the packages by running the following commands at your command prompt: <pre style="margin: 1.5em 0 1.5em 2em"> @@ -166,16 +195,9 @@ If there are no errors you're good to continue. We provide a Debian package to help you keep our signing key current. It is -recommended you use it. Install it using +recommended you use it. Install it along with tor using <pre style="margin: 1.5em 0 1.5em 2em"> -apt install deb.torproject.org-keyring -</pre> - - - -To finally install Tor just run: -<pre style="margin: 1.5em 0 1.5em 2em"> -apt install tor +apt install tor deb.torproject.org-keyring </pre> @@ -187,7 +209,6 @@ docs/tor-doc-unix>#using">step two</a> of the "Tor on Linux/Unix" instructions. -<noscript> The DNS name <code>deb.torproject.org</code> is actually a set of independent servers in a DNS round robin configuration. If you for some reason cannot @@ -198,46 +219,20 @@ access it you might try to use the name of one of its part instead. Try <code>deb.torproject.org</code> is also served through now also served via onion service: -<a href="http://sdscoq7snqtznauu.onion">http://sdscoq7snqtznauu.onion/</a>. +<a href="http://sdscoq7snqtznauu.onion">http://sdscoq7snqtznauu.onion/</a> To use the onion service with +apt, replace the address in the previously added lines: +<pre style="margin: 1.5em 0 1.5em 2em">. +# For the stable version. +deb tor://sdscoq7snqtznauu.onion/torproject.org buster main + +# For the unstable version. +deb tor://sdscoq7snqtznauu.onion/torproject.org tor-nightly-master-<DISTRIBUTION> main +</pre> See <a href="https://onion.torproject.org/">https://onion.torproject.org</a> for all torproject.org onion addresses. -<hr /> - -<a id="development"></a> -<h2><a class="anchor" href="#development">Option three: Using the -development branch of Tor on Debian or Ubuntu</a></h2> - - -If you want to use the <a href="<page -download/download-unix>#packagediff">development branch</a> of Tor instead -(more features and more bugs), you need to add a different set of lines -to your <tt>/etc/apt/sources.list</tt> file: -<pre style="margin: 1.5em 0 1.5em 2em"> -deb https://deb.torproject.org/torproject.org <DISTRIBUTION> main -deb https://deb.torproject.org/torproject.org tor-experimental-0.3.4.x-<DISTRIBUTION> main -</pre> -where you again substitute the name of your distro (stretch, buster, -sid, xenial, ...) in place of -<DISTRIBUTION>. - - - -Then run the following commands at your command prompt: -<pre style="margin: 1.5em 0 1.5em 2em"> -gpg --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 -gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - -apt update -apt install tor deb.torproject.org-keyring -</pre> - - - -Now Tor is installed and running. Move on to <a href="<page -docs/tor-doc-unix>#using">step two</a> of the "Tor on Linux/Unix" -instructions. - +<noscript> <hr />

1 0

[webwml/master] debian-selector.js: Bump Tor to 0.3.4.x
by hiro＠torproject.org 22 Aug '18

22 Aug '18

commit e71dd8f10140cff8a62e22b284d063ef07e00df6 Author: Traumschule <traumschule(a)riseup.net> Date: Sat Aug 11 15:54:16 2018 +0200 debian-selector.js: Bump Tor to 0.3.4.x --- docs/debian-selector.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/debian-selector.js b/docs/debian-selector.js index d0d31505..c8db5c2a 100644 --- a/docs/debian-selector.js +++ b/docs/debian-selector.js @@ -13,7 +13,7 @@ var software = { 'artful': [ 'artful'], 'bionic': [ 'bionic'], }, - 'experimental-0.3.3.x': { + 'experimental-0.3.4.x': { 'jessie': [ 'jessie' ], 'stretch': [ 'stretch' ], 'buster': [ 'buster' ], @@ -45,7 +45,7 @@ var software = { 'artful': [ 'artful'], 'bionic': [ 'bionic'], }, - 'experimental-0.3.3.x': { + 'experimental-0.3.4.x': { 'jessie': [ 'jessie' ], 'stretch': [ 'stretch' ], 'buster': [ 'buster' ],

1 0

[tor/master] Remove duplicate include in src/test/test_address.c
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 3bf4493cb9d400cf5cda864339de98dd3bf832e1 Author: Neel Chauhan <neel(a)neelc.org> Date: Tue Aug 21 20:01:48 2018 -0400 Remove duplicate include in src/test/test_address.c --- src/test/test_address.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index 7e2ccc1b5..e99220f83 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -26,7 +26,6 @@ #include "core/or/or.h" #include "feature/nodelist/nodelist.h" #include "lib/net/address.h" -#include "lib/net/address.h" #include "test/test.h" #include "test/log_test_helpers.h"

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/287'
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit e619fd02ef9a9926731244b2b19024a04f93fd5a Merge: 05cd3224a 3bf4493cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 20:08:55 2018 -0400 Merge remote-tracking branch 'tor-github/pr/287' src/test/test_address.c | 1 - 1 file changed, 1 deletion(-)

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit f0633bc49164a10ca163aa94139222682af376f7 Merge: 245025a3d 6463cdea5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 20:03:56 2018 -0400 Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3 .travis.yml | 262 +++++++++++++++++++++++++------------------ changes/bug26497 | 3 + changes/bug26497-backport | 3 + changes/bug26497-cd | 4 + changes/bug27088 | 5 + changes/bug27090 | 3 + changes/bug27093 | 3 + changes/ticket24629 | 3 + changes/ticket24629-backport | 3 + changes/ticket26560 | 3 + changes/ticket26952-cargo | 3 + changes/ticket26952-ccache | 3 + changes/ticket27087 | 3 + src/rust/tor_rust/include.am | 2 - src/test/test_rust.sh | 6 +- 15 files changed, 191 insertions(+), 118 deletions(-)

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'teor/travis-osx-034' into maint-0.3.4
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit aac1e17f22acfc7338ec5290db55fbbfd8ddfdbf Merge: f68aab83b c28da0d8e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 20:04:03 2018 -0400 Merge remote-tracking branch 'teor/travis-osx-034' into maint-0.3.4 .travis.yml | 276 ++++++++++++++++++++++++------------------- changes/bug26497 | 3 + changes/bug26497-backport | 3 + changes/bug26497-cd | 4 + changes/bug27088 | 5 + changes/bug27090 | 3 + changes/bug27093 | 3 + changes/ticket24629 | 3 + changes/ticket24629-backport | 3 + changes/ticket26560 | 3 + changes/ticket26952-cargo | 3 + changes/ticket26952-ccache | 3 + changes/ticket27087 | 3 + src/rust/tor_rust/include.am | 2 - src/test/test_rust.sh | 7 +- 15 files changed, 195 insertions(+), 129 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 9d64304bec7c6159bcd66f614e91c1a25df2e7e3 Merge: c4e96a3de 81e529d23 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 .travis.yml | 276 ++++++++++++++++++++++++------------------- changes/bug26497 | 3 + changes/bug26497-backport | 3 + changes/bug26497-cd | 4 + changes/bug27088 | 5 + changes/bug27090 | 3 + changes/bug27093 | 3 + changes/ticket24629 | 3 + changes/ticket24629-backport | 3 + changes/ticket26560 | 3 + changes/ticket26952-cargo | 3 + changes/ticket26952-ccache | 3 + changes/ticket27087 | 3 + src/rust/tor_rust/include.am | 2 - src/test/test_rust.sh | 7 +- 15 files changed, 195 insertions(+), 129 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 81e529d236f41607b133c5562e2d5887fcfd5b8a Merge: aac1e17f2 3cfceeb45 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 3cfceeb45d51f8f3c4960cabaad1849dcecb14a3 Merge: f0633bc49 a5bbe3f1d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3

1 0

[tor/release-0.3.3] Stop setting $CARGO_HOME in src/rust/tor_rust/include.am
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 0f3fd10ee0f609cae6d2fe87fa437026f5e9e003 Author: teor <teor(a)torproject.org> Date: Fri Aug 10 11:47:36 2018 +1000 Stop setting $CARGO_HOME in src/rust/tor_rust/include.am cargo will use the user's $CARGO_HOME, or $HOME/.cargo by default. Fixes bug 26497; bugfix on 0.3.1.5-alpha. --- src/rust/tor_rust/include.am | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/rust/tor_rust/include.am b/src/rust/tor_rust/include.am index c02324cb7..40511bf9f 100644 --- a/src/rust/tor_rust/include.am +++ b/src/rust/tor_rust/include.am @@ -7,7 +7,6 @@ EXTRA_CARGO_OPTIONS= src/rust/target/release/@TOR_RUST_STATIC_NAME@: FORCE ( cd "$(abs_top_builddir)/src/rust" ; \ CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ - CARGO_HOME="$(abs_top_builddir)/src/rust" \ $(CARGO) build --release $(EXTRA_CARGO_OPTIONS) \ $(CARGO_ONLINE) \ --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" ) @@ -15,7 +14,6 @@ src/rust/target/release/@TOR_RUST_STATIC_NAME@: FORCE distclean-rust: ( cd "$(abs_top_builddir)/src/rust" ; \ CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ - CARGO_HOME="$(abs_top_builddir)/src/rust" \ $(CARGO) clean $(EXTRA_CARGO_OPTIONS) \ $(CARGO_ONLINE) \ --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" )

1 0