]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Wed, 12 Aug 2020 12:40:10 +0000 (08:40 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

"ours" merge to avoid MR 122 -- we already merged MR 123.

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Wed, 12 Aug 2020 12:39:41 +0000 (08:39 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Nick Mathewson [Wed, 12 Aug 2020 12:39:41 +0000 (08:39 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoCI: Remove VS2015 AppVeyor build
George Kadianakis [Wed, 12 Aug 2020 11:09:32 +0000 (14:09 +0300)] 
CI: Remove VS2015 AppVeyor build

5 years agoCI: Remove VS2015 AppVeyor build.
George Kadianakis [Wed, 12 Aug 2020 11:05:21 +0000 (14:05 +0300)] 
CI: Remove VS2015 AppVeyor build.

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/107' into maint-0.4.4
George Kadianakis [Wed, 12 Aug 2020 10:47:34 +0000 (13:47 +0300)] 
Merge remote-tracking branch 'tor-gitlab/mr/107' into maint-0.4.4

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/104' into maint-0.4.4
George Kadianakis [Wed, 12 Aug 2020 10:23:08 +0000 (13:23 +0300)] 
Merge remote-tracking branch 'tor-gitlab/mr/104' into maint-0.4.4

5 years agobump version to 0.4.4.4-rc
Nick Mathewson [Tue, 11 Aug 2020 21:46:44 +0000 (17:46 -0400)] 
bump version to 0.4.4.4-rc

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/119' into maint-0.4.4
Nick Mathewson [Tue, 11 Aug 2020 16:40:02 +0000 (12:40 -0400)] 
Merge remote-tracking branch 'tor-gitlab/mr/119' into maint-0.4.4

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Tue, 11 Aug 2020 16:37:08 +0000 (12:37 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Nick Mathewson [Tue, 11 Aug 2020 16:37:08 +0000 (12:37 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Tue, 11 Aug 2020 16:37:08 +0000 (12:37 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoCI: label our python versions.
Nick Mathewson [Tue, 11 Aug 2020 16:24:03 +0000 (12:24 -0400)] 
CI: label our python versions.

5 years agoCI: Only run doxygen on 0.4.3 and later.
Nick Mathewson [Tue, 11 Aug 2020 16:22:35 +0000 (12:22 -0400)] 
CI: Only run doxygen on 0.4.3 and later.

5 years agoCI: enable documentation testing
Nick Mathewson [Tue, 11 Aug 2020 15:06:21 +0000 (11:06 -0400)] 
CI: enable documentation testing

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Tue, 11 Aug 2020 15:03:24 +0000 (11:03 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Nick Mathewson [Tue, 11 Aug 2020 15:03:24 +0000 (11:03 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Tue, 11 Aug 2020 15:03:24 +0000 (11:03 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoFix a pair of typos in ci-driver.sh.
Nick Mathewson [Tue, 11 Aug 2020 15:03:11 +0000 (11:03 -0400)] 
Fix a pair of typos in ci-driver.sh.

5 years agoFix "run_check_subsystem_order.sh" to use $PYTHON.
Nick Mathewson [Tue, 11 Aug 2020 15:01:31 +0000 (11:01 -0400)] 
Fix "run_check_subsystem_order.sh" to use $PYTHON.

Previously it just used /usr/bin/env/python, which would fail if we
only had a "python3" binary.

Fixes bug 40095; bugfix on 0.4.4.1-alpha.

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Tue, 11 Aug 2020 14:44:40 +0000 (10:44 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Nick Mathewson [Tue, 11 Aug 2020 14:44:40 +0000 (10:44 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Tue, 11 Aug 2020 14:44:40 +0000 (10:44 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoAdd a pair of warnings about only editing CI in 035
Nick Mathewson [Tue, 11 Aug 2020 14:44:32 +0000 (10:44 -0400)] 
Add a pair of warnings about only editing CI in 035

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/102' into maint-0.4.4
George Kadianakis [Tue, 11 Aug 2020 11:53:03 +0000 (14:53 +0300)] 
Merge remote-tracking branch 'tor-gitlab/mr/102' into maint-0.4.4

5 years agoRemove a BUG() that could normally trigger in edge-cases.
George Kadianakis [Tue, 11 Aug 2020 11:34:06 +0000 (14:34 +0300)] 
Remove a BUG() that could normally trigger in edge-cases.

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Mon, 10 Aug 2020 23:33:07 +0000 (19:33 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Mon, 10 Aug 2020 23:33:06 +0000 (19:33 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Nick Mathewson [Mon, 10 Aug 2020 23:32:49 +0000 (19:32 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agosmall code tweaks to try to work around debian stable complaints
Nick Mathewson [Mon, 10 Aug 2020 21:36:21 +0000 (17:36 -0400)] 
small code tweaks to try to work around debian stable complaints

5 years agoTry to set up a minimal gitlab CI script
Nick Mathewson [Mon, 10 Aug 2020 20:10:12 +0000 (16:10 -0400)] 
Try to set up a minimal gitlab CI script

This is based on @eighthave's templates, and the work we've been
doing to present a uniform testing environment.

5 years agoAdd a shareable continuous-integration script.
Nick Mathewson [Mon, 10 Aug 2020 19:58:28 +0000 (15:58 -0400)] 
Add a shareable continuous-integration script.

Eventually this should be used by every one of our CI scripts.

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Thu, 6 Aug 2020 17:24:12 +0000 (13:24 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Thu, 6 Aug 2020 17:24:11 +0000 (13:24 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Nick Mathewson [Thu, 6 Aug 2020 17:24:11 +0000 (13:24 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoCopy from master gitlab-ci.yml from master back to maint-0.3.5
Nick Mathewson [Thu, 6 Aug 2020 16:42:14 +0000 (12:42 -0400)] 
Copy from master gitlab-ci.yml from master back to maint-0.3.5

5 years agoMerge branch 'bug40083_035' into bug40083_042
Nick Mathewson [Tue, 4 Aug 2020 17:10:16 +0000 (13:10 -0400)] 
Merge branch 'bug40083_035' into bug40083_042

Fixes conflicts due to code movement.

5 years agoLaunch early reachability tests once a minute, not once a second.
Nick Mathewson [Tue, 4 Aug 2020 16:59:49 +0000 (12:59 -0400)] 
Launch early reachability tests once a minute, not once a second.

This fixes bug 40083, which was introduced in 9f31908a in
0.2.8.1-alpha.

5 years agoMerge branch 'ticket40081_035' into ticket40081_044
Nick Mathewson [Mon, 3 Aug 2020 15:49:09 +0000 (11:49 -0400)] 
Merge branch 'ticket40081_035' into ticket40081_044

Resolves conflicts:
src/core/or/channel.c
        src/test/test_channel.c

5 years agoRemove channel_is_canonical_is_reliable()
Nick Mathewson [Mon, 3 Aug 2020 15:25:37 +0000 (11:25 -0400)] 
Remove channel_is_canonical_is_reliable()

This function once served to let circuits continue to be built over
version-1 link connections.  But such connections are long-obsolete,
and it's time to remove this check.

Closes #40081.

5 years agoWipe address strings from connections before freeing them them.
Nick Mathewson [Mon, 3 Aug 2020 14:15:08 +0000 (10:15 -0400)] 
Wipe address strings from connections before freeing them them.

This is a defense-in-depth fix; closes 6198.

5 years agoAdd a tor_str_wipe_and_free() function.
Nick Mathewson [Mon, 3 Aug 2020 14:11:03 +0000 (10:11 -0400)] 
Add a tor_str_wipe_and_free() function.

Frequently we want to do

    if (s) {
      memwipe(s, 0, sizeof(s));
      tor_free(s);
    }

and it's good to have a way to do this concisely.

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.4.4
George Kadianakis [Mon, 3 Aug 2020 13:48:52 +0000 (16:48 +0300)] 
Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.4.4

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Alexander Færøy [Fri, 31 Jul 2020 02:03:35 +0000 (02:03 +0000)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Alexander Færøy [Fri, 31 Jul 2020 02:03:34 +0000 (02:03 +0000)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Alexander Færøy [Fri, 31 Jul 2020 02:03:34 +0000 (02:03 +0000)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoMerge branch 'bug40076_043' into bug40076_044
Nick Mathewson [Thu, 30 Jul 2020 18:28:11 +0000 (14:28 -0400)] 
Merge branch 'bug40076_043' into bug40076_044

5 years agoMerge branch 'bug40076_042' into bug40076_043
Nick Mathewson [Thu, 30 Jul 2020 18:27:29 +0000 (14:27 -0400)] 
Merge branch 'bug40076_042' into bug40076_043

5 years agoMerge branch 'maint-0.4.2' into bug40076_042
Nick Mathewson [Thu, 30 Jul 2020 18:27:29 +0000 (14:27 -0400)] 
Merge branch 'maint-0.4.2' into bug40076_042

5 years agoFix a bug in buf_move_all() when the input buffer is empty.
Nick Mathewson [Thu, 30 Jul 2020 18:24:25 +0000 (14:24 -0400)] 
Fix a bug in buf_move_all() when the input buffer is empty.

We found this in #40076, after we started using buf_move_all() in
more places.  Fixes bug #40076; bugfix on 0.3.3.1-alpha.  As far as
I know, the crash only affects master, but I think this warrants a
backport, "just in case".

5 years agoAdd unit test for buf_move_all(), including a failing case
Nick Mathewson [Thu, 30 Jul 2020 18:19:32 +0000 (14:19 -0400)] 
Add unit test for buf_move_all(), including a failing case

The failing case is #if'd out for now, but will be fixed in the next
commit.

Testing for a fix for #40076.

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Wed, 29 Jul 2020 16:37:08 +0000 (12:37 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Wed, 29 Jul 2020 16:37:07 +0000 (12:37 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Nick Mathewson [Wed, 29 Jul 2020 16:37:07 +0000 (12:37 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoAdd a changes file from mr 86 for 40072 fix.
Nick Mathewson [Wed, 29 Jul 2020 16:36:56 +0000 (12:36 -0400)] 
Add a changes file from mr 86 for 40072 fix.

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/68' into maint-0.4.4
Nick Mathewson [Wed, 29 Jul 2020 16:35:57 +0000 (12:35 -0400)] 
Merge remote-tracking branch 'tor-gitlab/mr/68' into maint-0.4.4

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/85' into maint-0.4.4
Alexander Færøy [Wed, 29 Jul 2020 13:57:47 +0000 (13:57 +0000)] 
Merge remote-tracking branch 'tor-gitlab/mr/85' into maint-0.4.4

5 years agoFix startup crash with seccomp sandbox enabled #40072
Daniel Pinto [Tue, 28 Jul 2020 23:34:08 +0000 (00:34 +0100)] 
Fix startup crash with seccomp sandbox enabled #40072

Fix crash introduced in #40020. On startup, tor calls
check_private_dir on the data and key directories. This function
uses open instead of opendir on the received directory. Data and
key directoryes are only opened here, so the seccomp rule added
should be for open instead of opendir, despite the fact that they
are directories.

5 years agoUse _lseeki64() on windows.
Nick Mathewson [Tue, 28 Jul 2020 15:30:47 +0000 (11:30 -0400)] 
Use _lseeki64() on windows.

Fixes bug 31036; bugfix on 0.2.1.8-alpha when we moved the logging
system to use posix fds.

5 years agobump to 0.4.4.3-alpha-dev
Nick Mathewson [Mon, 27 Jul 2020 23:15:15 +0000 (19:15 -0400)] 
bump to 0.4.4.3-alpha-dev

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Mon, 27 Jul 2020 16:56:19 +0000 (12:56 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Mon, 27 Jul 2020 16:56:18 +0000 (12:56 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Nick Mathewson [Mon, 27 Jul 2020 16:56:18 +0000 (12:56 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoBump to 0.4.4.3-alpha
Nick Mathewson [Mon, 27 Jul 2020 12:32:56 +0000 (08:32 -0400)] 
Bump to 0.4.4.3-alpha

5 years agofallbackdir: Remove all three Digitalcourage3 relays
David Goulet [Fri, 24 Jul 2020 18:56:05 +0000 (14:56 -0400)] 
fallbackdir: Remove all three Digitalcourage3 relays

They are about to be shutdown in September.

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Thu, 23 Jul 2020 14:09:14 +0000 (10:09 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Nick Mathewson [Thu, 23 Jul 2020 14:09:14 +0000 (10:09 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Thu, 23 Jul 2020 14:09:14 +0000 (10:09 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMore info in the fallbackdir changes file
Nick Mathewson [Thu, 23 Jul 2020 14:08:42 +0000 (10:08 -0400)] 
More info in the fallbackdir changes file

5 years agofallbackdir: Update list for 2020
David Goulet [Thu, 23 Jul 2020 13:51:45 +0000 (09:51 -0400)] 
fallbackdir: Update list for 2020

Closes #40061

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoMerge branch 'tor-gitlab/mr/77' into maint-0.4.4
David Goulet [Wed, 22 Jul 2020 20:14:11 +0000 (16:14 -0400)] 
Merge branch 'tor-gitlab/mr/77' into maint-0.4.4

5 years agoTreat all extorport connections with un-set addresses as remote
Nick Mathewson [Wed, 22 Jul 2020 19:20:41 +0000 (15:20 -0400)] 
Treat all extorport connections with un-set addresses as remote

Without this fix, if an PT forgets to send a USERADDR command, that
results in a connection getting treated as local for the purposes of
rate-limiting.

If the PT _does_ use USERADDR, we still believe it.

Closes ticket 33747.

5 years agoAdjust the rules for warning about too many connections.
Nick Mathewson [Wed, 22 Jul 2020 18:45:03 +0000 (14:45 -0400)] 
Adjust the rules for warning about too many connections.

Previously we tolerated up to 1.5 connections for every relay we
were connected to, and didn't warn if we had fewer than 5
connections total.

Now we tolerate up to 1.5 connections per relay, and up to 4
connections per authority, and we don't warn at all when we have
fewer than 25 connections total.

Fixes bug 33880, which seems to have been provoked by our #17592
change in 0.3.5.

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/68' into maint-0.4.4
Nick Mathewson [Tue, 21 Jul 2020 13:29:03 +0000 (09:29 -0400)] 
Merge remote-tracking branch 'tor-gitlab/mr/68' into maint-0.4.4

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/67' into maint-0.4.4
Nick Mathewson [Tue, 21 Jul 2020 13:24:15 +0000 (09:24 -0400)] 
Merge remote-tracking branch 'tor-gitlab/mr/67' into maint-0.4.4

5 years agoFix seccomp sandbox rules for openat #27315
Daniel Pinto [Wed, 1 Jul 2020 19:30:04 +0000 (20:30 +0100)] 
Fix seccomp sandbox rules for openat #27315

The need for casting negative syscall arguments depends on the
glibc version. This affects the rules for the openat syscall which
uses the constant AT_FDCWD that is defined as a negative number.
This commit adds logic to only apply the cast when necessary, on
glibc versions from 2.27 onwards.

5 years agoFix seccomp sandbox rules for opening directories #40020
Daniel Pinto [Wed, 1 Jul 2020 22:51:39 +0000 (23:51 +0100)] 
Fix seccomp sandbox rules for opening directories #40020

Different versions of glibc use either open or openat for the
opendir function. This commit adds logic to use the correct rule
for each glibc version, namely:
- Until 2.14 open is used
- From 2.15 to to 2.21 openat is used
- From 2.22 to 2.26 open is used
- From 2.27 onwards openat is used

5 years agoFix seccomp sandbox rules for openat #27315
Daniel Pinto [Wed, 1 Jul 2020 19:30:04 +0000 (20:30 +0100)] 
Fix seccomp sandbox rules for openat #27315

The need for casting negative syscall arguments depends on the
glibc version. This affects the rules for the openat syscall which
uses the constant AT_FDCWD that is defined as a negative number.
This commit adds logic to only apply the cast when necessary, on
glibc versions from 2.27 onwards.

5 years agoUse gitlab-friendly URLs when formatting changelogs as HTML
Nick Mathewson [Fri, 17 Jul 2020 13:31:32 +0000 (09:31 -0400)] 
Use gitlab-friendly URLs when formatting changelogs as HTML

Our old https://bugs.torproject.org/nnnn URLs only work for bugs
numbered before 40000.  Newer gitlab bugs need to have specific
projects mentioned.

This patch assumes that bugs are in tpo/core/tor by default, but
allows us to refer to several other projects by saying
e.g. "chutney#40002" if we want.

5 years agoMerge remote-tracking branch 'tor-gitlab/merge-requests/43' into maint-0.4.4
Alexander Færøy [Tue, 14 Jul 2020 14:47:48 +0000 (14:47 +0000)] 
Merge remote-tracking branch 'tor-gitlab/merge-requests/43' into maint-0.4.4

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
David Goulet [Mon, 13 Jul 2020 19:03:34 +0000 (15:03 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoChanges file for ticket 31812.
Nick Mathewson [Mon, 13 Jul 2020 14:42:41 +0000 (10:42 -0400)] 
Changes file for ticket 31812.

5 years agoBug 31812: Change http URL's to https
JeremyRand [Fri, 20 Sep 2019 07:58:30 +0000 (07:58 +0000)] 
Bug 31812: Change http URL's to https

5 years agoRemove check-cocci from check-local target.
Nick Mathewson [Mon, 13 Jul 2020 13:24:26 +0000 (09:24 -0400)] 
Remove check-cocci from check-local target.

check-cocci is still a good idea -- perhaps as a cron job?  But
doing it as part of our regular tests has just been confusing,
especially to volunteers who shouldn't have to become coccinelle
experts in order to get their patches through our CI.

Closes #40030.

5 years agoNSS: Tell NSS that our SSL sockets are nonblocking.
Nick Mathewson [Fri, 10 Jul 2020 17:14:33 +0000 (13:14 -0400)] 
NSS: Tell NSS that our SSL sockets are nonblocking.

Closes ticket 40035.

5 years agoBump to 0.4.4.2-alpha-dev
Nick Mathewson [Thu, 9 Jul 2020 17:15:45 +0000 (13:15 -0400)] 
Bump to 0.4.4.2-alpha-dev

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Thu, 9 Jul 2020 17:15:23 +0000 (13:15 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

`-s ours` to avoid version bump.

5 years agoBump to 0.4.3.6-dev
Nick Mathewson [Thu, 9 Jul 2020 17:15:15 +0000 (13:15 -0400)] 
Bump to 0.4.3.6-dev

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Thu, 9 Jul 2020 17:14:58 +0000 (13:14 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

`-s ours` to avoid version bump.

5 years agoBump to 0.4.2.8-dev
Nick Mathewson [Thu, 9 Jul 2020 17:14:48 +0000 (13:14 -0400)] 
Bump to 0.4.2.8-dev

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Nick Mathewson [Thu, 9 Jul 2020 17:14:22 +0000 (13:14 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

`-s ours` to avoid version bump.

5 years agoBump to 0.3.5.11-dev
Nick Mathewson [Thu, 9 Jul 2020 17:12:45 +0000 (13:12 -0400)] 
Bump to 0.3.5.11-dev

5 years agoUpdate version to 0.4.4.2-alpha.
Nick Mathewson [Thu, 9 Jul 2020 14:31:55 +0000 (10:31 -0400)] 
Update version to 0.4.4.2-alpha.

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Thu, 9 Jul 2020 14:31:16 +0000 (10:31 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

`-s ours` to avoid version bump.

5 years agoUpdate version to 0.4.3.6.
Nick Mathewson [Thu, 9 Jul 2020 14:31:09 +0000 (10:31 -0400)] 
Update version to 0.4.3.6.

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Thu, 9 Jul 2020 14:30:46 +0000 (10:30 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

`-s ours` to avoid version bump.

5 years agoUpdate version to 0.4.2.8.
Nick Mathewson [Thu, 9 Jul 2020 14:30:37 +0000 (10:30 -0400)] 
Update version to 0.4.2.8.

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Nick Mathewson [Thu, 9 Jul 2020 14:30:03 +0000 (10:30 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

`-s ours` to avoid version bump.

5 years agobump to 0.3.5.11
Nick Mathewson [Thu, 9 Jul 2020 14:28:21 +0000 (10:28 -0400)] 
bump to 0.3.5.11

5 years agoMerge branch 'tor-github/pr/1989' into maint-0.4.4
George Kadianakis [Thu, 9 Jul 2020 14:08:07 +0000 (17:08 +0300)] 
Merge branch 'tor-github/pr/1989' into maint-0.4.4