Commit Graph

34029 Commits

Author SHA1 Message Date
Alexander Færøy c10323faae Merge branch 'maint-0.4.2' into release-0.4.2 2020-06-30 13:37:20 +00:00
Alexander Færøy b0bfee8c78 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-06-30 13:37:20 +00:00
Alexander Færøy bebdd2888f Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5 2020-06-30 13:35:13 +00:00
Nick Mathewson ec2bc07f42 Merge branch 'maint-0.4.2' into release-0.4.2 2020-06-29 13:57:50 -04:00
Nick Mathewson d235e523d5 Merge branch 'ticket33290_v2_042' into maint-0.4.2 2020-06-29 13:57:13 -04:00
Nick Mathewson 5668287fe7 Merge branch 'maint-0.4.2' into release-0.4.2 2020-06-29 13:53:39 -04:00
Nick Mathewson a692b87f82 Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2 2020-06-29 13:53:27 -04:00
Nick Mathewson 64b8ee3f9e Merge branch 'maint-0.4.2' into release-0.4.2 2020-06-29 13:48:32 -04:00
Nick Mathewson 0575a182a6 Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2 2020-06-29 13:48:25 -04:00
Nick Mathewson 57390b76bf Merge branch 'maint-0.4.2' into release-0.4.2 2020-06-29 12:58:50 -04:00
Nick Mathewson 216456299f Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2 2020-06-29 12:58:23 -04:00
Nick Mathewson 51b4a4bd1c Merge branch 'maint-0.4.2' into release-0.4.2 2020-06-29 12:55:35 -04:00
Nick Mathewson fd8ce812b0 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-06-29 12:55:35 -04:00
Nick Mathewson 0c0214bcc0 Merge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5 2020-06-29 12:55:27 -04:00
David Goulet fadea75ada Merge branch 'maint-0.4.2' into release-0.4.2 2020-06-12 12:55:41 -04:00
David Goulet 0f218a05a6 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-06-12 12:55:41 -04:00
David Goulet 6a43aadecc Merge branch 'tor-github/pr/1912' into maint-0.3.5 2020-06-12 12:55:17 -04:00
Nick Mathewson 6eee995cc9 Merge branch 'maint-0.4.2' into release-0.4.2 2020-06-05 12:37:29 -04:00
Nick Mathewson 1930828957 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-06-05 12:37:29 -04:00
Alexander Færøy c1add51bcc Update and upgrade Pacman before installing dependencies in AppVeyor.
This patch makes sures that AppVeyor upgrades its Pacman (the package
manager) before installing the Tor dependencies.

See: https://bugs.torproject.org/34384
2020-06-05 12:37:08 -04:00
Nick Mathewson f49f1d6fb2 Revert "Travis: temporarily fix stem version to d1174a83c2dcb7b8"
This reverts commit e63bfca5f2, now
that Stem has been upgraded to fix the underlying issue.
2020-06-03 14:48:05 -04:00
Nick Mathewson d63eeb1b69 Merge branch 'maint-0.4.2' into release-0.4.2 2020-05-15 10:25:27 -04:00
Nick Mathewson e75583e71b Merge branch 'maint-0.4.1' into maint-0.4.2 2020-05-15 10:25:27 -04:00
Nick Mathewson 768ffb8f43 Merge branch 'maint-0.3.5' into maint-0.4.1 2020-05-15 10:25:27 -04:00
Nick Mathewson a59d54756f Fix use of non-portable == in configure.ac.
Fixes bug 34233.

(This has bug has been backported to 0.3.5, but only released in
0.4.3, so it only needs a changes file there.)
2020-05-15 09:58:49 -04:00
Nick Mathewson 2a9ffeb475 Merge branch 'maint-0.4.2' into release-0.4.2 2020-05-14 10:20:08 -04:00
Nick Mathewson b8bff426f3 Merge branch 'maint-0.4.1' into maint-0.4.2 2020-05-14 10:20:08 -04:00
Nick Mathewson 72312cdbb1 Merge branch 'maint-0.3.5' into maint-0.4.1 2020-05-14 10:20:08 -04:00
Nick Mathewson e63bfca5f2 Travis: temporarily fix stem version to d1174a83c2dcb7b8
This is a workaround for https://github.com/torproject/stem/issues/63
2020-05-14 08:08:24 -04:00
Nick Mathewson ab92fd5907 Merge branch 'maint-0.4.2' into release-0.4.2 2020-05-06 17:18:46 -04:00
Nick Mathewson b16c1e4cf6 Merge branch 'maint-0.4.1' into maint-0.4.2 2020-05-06 17:07:27 -04:00
Nick Mathewson d41f1cd3ed btrack_orconn_cevent.c: Add a missing "break;" 2020-05-06 17:07:12 -04:00
Nick Mathewson 6b08392152 Merge branch 'maint-0.4.2' into release-0.4.2 2020-05-06 16:58:12 -04:00
Nick Mathewson d46f67ef0e Merge branch 'maint-0.4.1' into maint-0.4.2 2020-05-06 16:58:12 -04:00
Nick Mathewson 633366efcd Merge branch 'maint-0.3.5' into maint-0.4.1 2020-05-06 16:58:12 -04:00
Nick Mathewson dd795fbee4 changes file for bug 34078. 2020-05-06 16:58:06 -04:00
Nick Mathewson 28ac17f433 Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial "case:" block that didn't end
with break, return, or something like that.  Clang recently added
the same thing.

GCC, however, would let you annotate a fall-through as intended by
any of various magic "/* fall through */" comments.  Clang, however,
only seems to like "__attribute__((fallthrough))".  Fortunately, GCC
accepts that too.

A previous commit in this branch defined a FALLTHROUGH macro to do
the right thing if GNUC is defined; here we replace all of our "fall
through" comments with uses of that macro.

This is an automated commit, made with the following perl one-liner:

  #!/usr/bin/perl -i -p
  s#/\* *falls? ?thr.*?\*/#FALLTHROUGH;#i;

(In order to avoid conflicts, I'm applying this script separately to
each maint branch. This is the 0.4.2 version.)
2020-05-06 16:53:40 -04:00
Nick Mathewson f954514b37 Merge branch 'maint-0.4.1' into maint-0.4.2
This is an "ours" merge to avoid taking the 0.4.1 version of the 34078 fix.
2020-05-06 16:53:06 -04:00
Nick Mathewson 79ff2b6aab Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial "case:" block that didn't end
with break, return, or something like that.  Clang recently added
the same thing.

GCC, however, would let you annotate a fall-through as intended by
any of various magic "/* fall through */" comments.  Clang, however,
only seems to like "__attribute__((fallthrough))".  Fortunately, GCC
accepts that too.

A previous commit in this branch defined a FALLTHROUGH macro to do
the right thing if GNUC is defined; here we replace all of our "fall
through" comments with uses of that macro.

This is an automated commit, made with the following perl one-liner:

  #!/usr/bin/perl -i -p
  s#/\* *falls? ?thr.*?\*/#FALLTHROUGH;#i;

(In order to avoid conflicts, I'm applying this script separately to
each maint branch. This is the 0.4.1 version.)
2020-05-06 16:52:03 -04:00
Nick Mathewson dd0ee016e9 Merge branch 'maint-0.3.5' into maint-0.4.1
This is an "ours" merge to avoid taking the 0.3.5 fix for 34078.
2020-05-06 16:51:33 -04:00
Nick Mathewson cc397449fc Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial "case:" block that didn't end
with break, return, or something like that.  Clang recently added
the same thing.

GCC, however, would let you annotate a fall-through as intended by
any of various magic "/* fall through */" comments.  Clang, however,
only seems to like "__attribute__((fallthrough))".  Fortunately, GCC
accepts that too.

A previous commit in this branch defined a FALLTHROUGH macro to do
the right thing if GNUC is defined; here we replace all of our "fall
through" comments with uses of that macro.

This is an automated commit, made with the following perl one-liner:

  #!/usr/bin/perl -i -p
  s#/\* *falls? ?thr.*?\*/#FALLTHROUGH;#i;
2020-05-06 16:51:11 -04:00
Nick Mathewson c2d002c633 Merge branch 'maint-0.4.2' into release-0.4.2 2020-05-06 16:47:03 -04:00
Nick Mathewson d04b708b4b Merge branch 'maint-0.4.1' into maint-0.4.2 2020-05-06 16:47:03 -04:00
Nick Mathewson 28f453c476 Merge branch 'maint-0.3.5' into maint-0.4.1 2020-05-06 16:47:03 -04:00
Nick Mathewson 1041306092 Merge branch 'bug34078_prelim_041' into maint-0.4.1 2020-05-06 16:46:52 -04:00
Nick Mathewson 78a72f8196 Merge branch 'bug34078_prelim_035' into maint-0.3.5 2020-05-06 16:46:31 -04:00
Nick Mathewson 3e42464f5a Merge branch 'bug34078_prelim_035' into bug34078_prelim_041 2020-05-06 15:18:36 -04:00
Nick Mathewson 3d3641152b Remove an incorrect "Fall through" comment. 2020-05-06 15:08:02 -04:00
Nick Mathewson 8798c0a94a address.c: add a single (harmless) missing break; 2020-05-06 15:08:02 -04:00
Nick Mathewson 37b8324ed3 include compat_compiler for ed25519_donna 2020-05-06 15:08:02 -04:00