[tor-commits] [snowflake/master] Remove client test with nil broker

commit 50673d49437c55aba2a5f7f31819bcae60406b07 Author: Cecylia Bocovich Date: Wed Jan 29 11:40:29 2020 -0500 Remove client test with nil broker We are no longer checking for nil BrokerChannels in Catch because this case is caught from the return values of NewBrokerChannel.

[tor-commits] [snowflake/master] Update client tests for NewBrokerChannel errors

commit 7682986a451deb3a4d28240fa7d8b06ed5d7a5dd Author: Cecylia Bocovich Date: Wed Jan 29 11:27:44 2020 -0500 Update client tests for NewBrokerChannel errors We changed NewBrokerChannel to return an error value on failure. This updates the tests to check that value. ---

[tor-commits] [tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5

commit 41d52e9cd80bfb318ec7f0969f3889d275012e37 Merge: 19954cffd 0d64bafcf Author: teor Date: Thu Jan 30 07:53:53 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40

[tor-commits] [tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0

commit 65825018c7aed931324dd427bb1e84544a9b2f47 Merge: 026f068bb 41d52e9cd Author: teor Date: Thu Jan 30 07:54:58 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40 ++-- 2

[tor-commits] [tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5

commit 41d52e9cd80bfb318ec7f0969f3889d275012e37 Merge: 19954cffd 0d64bafcf Author: teor Date: Thu Jan 30 07:53:53 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40

[tor-commits] [tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1634' into maint-0.4.1

commit 9b0b2aef806c5d9bcb5e5acd4b4c3cf7488ec442 Merge: fb541ffca 54eec5342 Author: teor Date: Thu Jan 30 07:54:39 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1634' into maint-0.4.1 changes/bug32778 | 3 +++ src/app/main/main.c | 4 ++-- src/app/main/main.h | 3 +++

[tor-commits] [tor/release-0.4.1] Initialize publish/subscribe code when running as an NT service.

commit 54eec5342d45e9add5b9a8fee0167267c38f63f9 Author: Nick Mathewson Date: Mon Jan 6 08:45:29 2020 -0500 Initialize publish/subscribe code when running as an NT service. Fixes bug 32778; bugfix on 0.4.1.1-alpha. --- changes/bug32778 | 3 +++ src/app/main/main.c | 4 ++--

[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2

commit 7b6be02a923075ec3966d967cca26eb8d16b645e Merge: 48187248d 6b392c333 Author: teor Date: Thu Jan 30 07:55:12 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/bug29819 | 8 changes/bug32778 | 3 +++ src/app/main/main.c | 4 ++--

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5

commit 41d52e9cd80bfb318ec7f0969f3889d275012e37 Merge: 19954cffd 0d64bafcf Author: teor Date: Thu Jan 30 07:53:53 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

commit c3e300dc9c4b63c88bd1e0add0335cf6662d6ec1 Merge: 792172ffe 41d52e9cd Author: teor Date: Thu Jan 30 07:54:54 2020 +1000 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40 ++-- 2

[tor-commits] [tor/release-0.3.5] Correct how we use libseccomp

commit 0d64bafcfedd259fb15b3ee85a7b00a840aec73b Author: Peter Gerber Date: Mon Jun 10 14:56:31 2019 +0200 Correct how we use libseccomp This fixes a startup crash with libseccomp v2.4.0 if Sandbox is set to 1. --- changes/bug29819 | 8

[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0

commit 65825018c7aed931324dd427bb1e84544a9b2f47 Merge: 026f068bb 41d52e9cd Author: teor Date: Thu Jan 30 07:54:58 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40 ++-- 2

[tor-commits] [tor/maint-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0

commit 65825018c7aed931324dd427bb1e84544a9b2f47 Merge: 026f068bb 41d52e9cd Author: teor Date: Thu Jan 30 07:54:58 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40 ++-- 2

[tor-commits] [tor/maint-0.4.2] Initialize publish/subscribe code when running as an NT service.

commit 54eec5342d45e9add5b9a8fee0167267c38f63f9 Author: Nick Mathewson Date: Mon Jan 6 08:45:29 2020 -0500 Initialize publish/subscribe code when running as an NT service. Fixes bug 32778; bugfix on 0.4.1.1-alpha. --- changes/bug32778 | 3 +++ src/app/main/main.c | 4 ++--

[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.0

commit 65825018c7aed931324dd427bb1e84544a9b2f47 Merge: 026f068bb 41d52e9cd Author: teor Date: Thu Jan 30 07:54:58 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40 ++-- 2

[tor-commits] [tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1634' into maint-0.4.1

commit 9b0b2aef806c5d9bcb5e5acd4b4c3cf7488ec442 Merge: fb541ffca 54eec5342 Author: teor Date: Thu Jan 30 07:54:39 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1634' into maint-0.4.1 changes/bug32778 | 3 +++ src/app/main/main.c | 4 ++-- src/app/main/main.h | 3 +++

[tor-commits] [tor/maint-0.4.2] Correct how we use libseccomp

commit 0d64bafcfedd259fb15b3ee85a7b00a840aec73b Author: Peter Gerber Date: Mon Jun 10 14:56:31 2019 +0200 Correct how we use libseccomp This fixes a startup crash with libseccomp v2.4.0 if Sandbox is set to 1. --- changes/bug29819 | 8

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5

commit 41d52e9cd80bfb318ec7f0969f3889d275012e37 Merge: 19954cffd 0d64bafcf Author: teor Date: Thu Jan 30 07:53:53 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40

[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.4.0' into maint-0.4.1

commit 6b392c333a854bb4d18ae6ea1686627451bb03f8 Merge: 9b0b2aef8 65825018c Author: teor Date: Thu Jan 30 07:55:05 2020 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40 ++-- 2

[tor-commits] [tor/maint-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1

commit 6b392c333a854bb4d18ae6ea1686627451bb03f8 Merge: 9b0b2aef8 65825018c Author: teor Date: Thu Jan 30 07:55:05 2020 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40 ++-- 2

[tor-commits] [tor/release-0.4.0] Correct how we use libseccomp

commit 0d64bafcfedd259fb15b3ee85a7b00a840aec73b Author: Peter Gerber Date: Mon Jun 10 14:56:31 2019 +0200 Correct how we use libseccomp This fixes a startup crash with libseccomp v2.4.0 if Sandbox is set to 1. --- changes/bug29819 | 8

[tor-commits] [tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5

commit 41d52e9cd80bfb318ec7f0969f3889d275012e37 Merge: 19954cffd 0d64bafcf Author: teor Date: Thu Jan 30 07:53:53 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40

[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1

commit 6b392c333a854bb4d18ae6ea1686627451bb03f8 Merge: 9b0b2aef8 65825018c Author: teor Date: Thu Jan 30 07:55:05 2020 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40 ++-- 2

[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2

commit 7b6be02a923075ec3966d967cca26eb8d16b645e Merge: 48187248d 6b392c333 Author: teor Date: Thu Jan 30 07:55:12 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/bug29819 | 8 changes/bug32778 | 3 +++ src/app/main/main.c | 4 ++--

[tor-commits] [tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1634' into maint-0.4.1

commit 9b0b2aef806c5d9bcb5e5acd4b4c3cf7488ec442 Merge: fb541ffca 54eec5342 Author: teor Date: Thu Jan 30 07:54:39 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1634' into maint-0.4.1 changes/bug32778 | 3 +++ src/app/main/main.c | 4 ++-- src/app/main/main.h | 3 +++

[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0

commit 65825018c7aed931324dd427bb1e84544a9b2f47 Merge: 026f068bb 41d52e9cd Author: teor Date: Thu Jan 30 07:54:58 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40 ++-- 2

[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2

commit 924d1ebb384f9a586e3b8fbf6eed12bf55db77f2 Merge: 3bfbeff80 7b6be02a9 Author: teor Date: Thu Jan 30 07:55:16 2020 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug29819 | 8 changes/bug32778 | 3 +++ src/app/main/main.c | 4 ++--

[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0

commit d0d2aba9f32fd6725f84f5d8a91ef6798e3dbb73 Merge: 8e3e8b0a1 65825018c Author: teor Date: Thu Jan 30 07:55:01 2020 +1000 Merge branch 'maint-0.4.0' into release-0.4.0 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40 ++-- 2

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1634' into maint-0.4.1

commit 9b0b2aef806c5d9bcb5e5acd4b4c3cf7488ec442 Merge: fb541ffca 54eec5342 Author: teor Date: Thu Jan 30 07:54:39 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1634' into maint-0.4.1 changes/bug32778 | 3 +++ src/app/main/main.c | 4 ++-- src/app/main/main.h | 3 +++

[tor-commits] [tor/master] Merge branch 'maint-0.4.2'

commit c1d4399c82d7a04e6c89487d76e07f2304fe55d2 Merge: 99671c0da 7b6be02a9 Author: teor Date: Thu Jan 30 07:55:20 2020 +1000 Merge branch 'maint-0.4.2' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5

commit 41d52e9cd80bfb318ec7f0969f3889d275012e37 Merge: 19954cffd 0d64bafcf Author: teor Date: Thu Jan 30 07:53:53 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40

[tor-commits] [tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2

commit 7b6be02a923075ec3966d967cca26eb8d16b645e Merge: 48187248d 6b392c333 Author: teor Date: Thu Jan 30 07:55:12 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/bug29819 | 8 changes/bug32778 | 3 +++ src/app/main/main.c | 4 ++--

[tor-commits] [tor/maint-0.4.0] Correct how we use libseccomp

commit 0d64bafcfedd259fb15b3ee85a7b00a840aec73b Author: Peter Gerber Date: Mon Jun 10 14:56:31 2019 +0200 Correct how we use libseccomp This fixes a startup crash with libseccomp v2.4.0 if Sandbox is set to 1. --- changes/bug29819 | 8

[tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5

commit 41d52e9cd80bfb318ec7f0969f3889d275012e37 Merge: 19954cffd 0d64bafcf Author: teor Date: Thu Jan 30 07:53:53 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40

[tor-commits] [tor/maint-0.4.1] Initialize publish/subscribe code when running as an NT service.

commit 54eec5342d45e9add5b9a8fee0167267c38f63f9 Author: Nick Mathewson Date: Mon Jan 6 08:45:29 2020 -0500 Initialize publish/subscribe code when running as an NT service. Fixes bug 32778; bugfix on 0.4.1.1-alpha. --- changes/bug32778 | 3 +++ src/app/main/main.c | 4 ++--

[tor-commits] [tor/maint-0.4.1] Correct how we use libseccomp

commit 0d64bafcfedd259fb15b3ee85a7b00a840aec73b Author: Peter Gerber Date: Mon Jun 10 14:56:31 2019 +0200 Correct how we use libseccomp This fixes a startup crash with libseccomp v2.4.0 if Sandbox is set to 1. --- changes/bug29819 | 8

[tor-commits] [tor/maint-0.3.5] Correct how we use libseccomp

commit 0d64bafcfedd259fb15b3ee85a7b00a840aec73b Author: Peter Gerber Date: Mon Jun 10 14:56:31 2019 +0200 Correct how we use libseccomp This fixes a startup crash with libseccomp v2.4.0 if Sandbox is set to 1. --- changes/bug29819 | 8

[tor-commits] [tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5

commit 41d52e9cd80bfb318ec7f0969f3889d275012e37 Merge: 19954cffd 0d64bafcf Author: teor Date: Thu Jan 30 07:53:53 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

commit 6b392c333a854bb4d18ae6ea1686627451bb03f8 Merge: 9b0b2aef8 65825018c Author: teor Date: Thu Jan 30 07:55:05 2020 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40 ++-- 2

[tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0

commit 65825018c7aed931324dd427bb1e84544a9b2f47 Merge: 026f068bb 41d52e9cd Author: teor Date: Thu Jan 30 07:54:58 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40 ++-- 2

[tor-commits] [tor/maint-0.4.2] bump to 0.4.1.8

commit ec7f99e6ef23f05d8fea4b8b63cc4f5ecc92eb33 Author: Nick Mathewson Date: Wed Jan 29 19:42:24 2020 -0500 bump to 0.4.1.8 --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

[tor-commits] [tor/maint-0.4.1] bump to 0.4.1.8

commit ec7f99e6ef23f05d8fea4b8b63cc4f5ecc92eb33 Author: Nick Mathewson Date: Wed Jan 29 19:42:24 2020 -0500 bump to 0.4.1.8 --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

[tor-commits] [tor/release-0.4.2] start a changelog for 0.4.2.6

commit 60cd9f946c2155bd8231bc80d321ebaa98db0b49 Author: Nick Mathewson Date: Wed Jan 29 19:55:07 2020 -0500 start a changelog for 0.4.2.6 --- ChangeLog | 51 + changes/bug29819| 8 --- changes/bug32771

[tor-commits] [tor/release-0.4.2] Sort 0.4.2.6 changelog.

commit 4177746f96aa2bcc074fb2d64d8780f90a006228 Author: Nick Mathewson Date: Wed Jan 29 19:56:02 2020 -0500 Sort 0.4.2.6 changelog. --- ChangeLog | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index

[tor-commits] [tor/release-0.4.2] Write a blurb for 0.4.2.6

commit db34b2fb2588dbfd62e00c7a0b0a1ade39633f4d Author: Nick Mathewson Date: Wed Jan 29 19:58:05 2020 -0500 Write a blurb for 0.4.2.6 --- ChangeLog | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 33aec7cf8..4d2ca4f50 100644 ---

[tor-commits] [tor/release-0.4.2] Initialize publish/subscribe code when running as an NT service.

commit 54eec5342d45e9add5b9a8fee0167267c38f63f9 Author: Nick Mathewson Date: Mon Jan 6 08:45:29 2020 -0500 Initialize publish/subscribe code when running as an NT service. Fixes bug 32778; bugfix on 0.4.1.1-alpha. --- changes/bug32778 | 3 +++ src/app/main/main.c | 4 ++--

[tor-commits] [tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1634' into maint-0.4.1

commit 9b0b2aef806c5d9bcb5e5acd4b4c3cf7488ec442 Merge: fb541ffca 54eec5342 Author: teor Date: Thu Jan 30 07:54:39 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1634' into maint-0.4.1 changes/bug32778 | 3 +++ src/app/main/main.c | 4 ++-- src/app/main/main.h | 3 +++

[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1

commit d211b20fbf80c03818d99e99d68e5ae8a3884295 Merge: 2be3b8275 6b392c333 Author: teor Date: Thu Jan 30 07:55:09 2020 +1000 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug29819 | 8 changes/bug32778 | 3 +++ src/app/main/main.c | 4 ++--

[tor-commits] [tor/release-0.4.2] Correct how we use libseccomp

commit 0d64bafcfedd259fb15b3ee85a7b00a840aec73b Author: Peter Gerber Date: Mon Jun 10 14:56:31 2019 +0200 Correct how we use libseccomp This fixes a startup crash with libseccomp v2.4.0 if Sandbox is set to 1. --- changes/bug29819 | 8

[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.0' into maint-0.4.1

commit 6b392c333a854bb4d18ae6ea1686627451bb03f8 Merge: 9b0b2aef8 65825018c Author: teor Date: Thu Jan 30 07:55:05 2020 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40 ++-- 2

[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.0

commit 65825018c7aed931324dd427bb1e84544a9b2f47 Merge: 026f068bb 41d52e9cd Author: teor Date: Thu Jan 30 07:54:58 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40 ++-- 2

[tor-commits] [tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5

commit 41d52e9cd80bfb318ec7f0969f3889d275012e37 Merge: 19954cffd 0d64bafcf Author: teor Date: Thu Jan 30 07:53:53 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5 changes/bug29819 | 8 src/lib/sandbox/sandbox.c | 40

[tor-commits] [tor/release-0.4.1] Correct how we use libseccomp

commit 0d64bafcfedd259fb15b3ee85a7b00a840aec73b Author: Peter Gerber Date: Mon Jun 10 14:56:31 2019 +0200 Correct how we use libseccomp This fixes a startup crash with libseccomp v2.4.0 if Sandbox is set to 1. --- changes/bug29819 | 8

[tor-commits] [tor/master] bump to 0.4.1.8

commit ec7f99e6ef23f05d8fea4b8b63cc4f5ecc92eb33 Author: Nick Mathewson Date: Wed Jan 29 19:42:24 2020 -0500 bump to 0.4.1.8 --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

[tor-commits] [tor/maint-0.4.2] Bump version to 0.4.2.6

commit f470b863a0fc8ebfff32f580e8da9f93525c9d56 Author: Nick Mathewson Date: Wed Jan 29 19:44:29 2020 -0500 Bump version to 0.4.2.6 --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2

commit 0fb407591b8e5e028884aa6e07b7b1550bd0c703 Merge: 7b6be02a9 ec7f99e6e Author: Nick Mathewson Date: Wed Jan 29 19:42:43 2020 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 "Ours" merge to avoid version bump. ___ tor-commits

[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2

commit 8b03ae1e57dee88124f5660faabd0995deff0fe0 Merge: 924d1ebb3 f470b863a Author: Nick Mathewson Date: Wed Jan 29 19:44:48 2020 -0500 Merge branch 'maint-0.4.2' into release-0.4.2 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1

commit 3090839168377f17998cd9c4b7321aab7d9286c8 Merge: d211b20fb ec7f99e6e Author: Nick Mathewson Date: Wed Jan 29 19:44:48 2020 -0500 Merge branch 'maint-0.4.1' into release-0.4.1 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

[tor-commits] [tor/release-0.4.1] bump to 0.4.1.8

commit ec7f99e6ef23f05d8fea4b8b63cc4f5ecc92eb33 Author: Nick Mathewson Date: Wed Jan 29 19:42:24 2020 -0500 bump to 0.4.1.8 --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

[tor-commits] [tor/master] Bump version to 0.4.2.6

commit f470b863a0fc8ebfff32f580e8da9f93525c9d56 Author: Nick Mathewson Date: Wed Jan 29 19:44:29 2020 -0500 Bump version to 0.4.2.6 --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

[tor-commits] [tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2

commit 0fb407591b8e5e028884aa6e07b7b1550bd0c703 Merge: 7b6be02a9 ec7f99e6e Author: Nick Mathewson Date: Wed Jan 29 19:42:43 2020 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 "Ours" merge to avoid version bump. ___ tor-commits

[tor-commits] [tor/release-0.4.2] Bump version to 0.4.2.6

commit f470b863a0fc8ebfff32f580e8da9f93525c9d56 Author: Nick Mathewson Date: Wed Jan 29 19:44:29 2020 -0500 Bump version to 0.4.2.6 --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2

commit 0fb407591b8e5e028884aa6e07b7b1550bd0c703 Merge: 7b6be02a9 ec7f99e6e Author: Nick Mathewson Date: Wed Jan 29 19:42:43 2020 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 "Ours" merge to avoid version bump. ___ tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.4.2'

commit 39c5e1b84994c2f226a8530b930f215cc5ffb877 Merge: c1d4399c8 f470b863a Author: Nick Mathewson Date: Wed Jan 29 19:44:34 2020 -0500 Merge branch 'maint-0.4.2' Use "-s ours" to avoid version bump. ___ tor-commits mailing list

[tor-commits] [tor/release-0.4.2] bump to 0.4.1.8

commit ec7f99e6ef23f05d8fea4b8b63cc4f5ecc92eb33 Author: Nick Mathewson Date: Wed Jan 29 19:42:24 2020 -0500 bump to 0.4.1.8 --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

[tor-commits] [tor/release-0.4.1] Changelog for 0.4.1.8

commit 84aa01aecb585fa6762be48b9c268e76835482f8 Author: Nick Mathewson Date: Wed Jan 29 20:06:15 2020 -0500 Changelog for 0.4.1.8 --- ChangeLog | 43 +++ changes/bug29819| 8 changes/bug32778| 3 --- changes/bug32841