Tor

tor:maint-0.4.1

Last commit made on 2020-05-15
Get this branch:
git clone -b maint-0.4.1 https://git.launchpad.net/tor

Branch merges

Branch information

Name:
maint-0.4.1
Repository:
lp:tor

Recent commits

768ffb8... by Nick Mathewson <email address hidden>

Merge branch 'maint-0.3.5' into maint-0.4.1

a59d547... by Nick Mathewson <email address hidden>

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.)

72312cd... by Nick Mathewson <email address hidden>

Merge branch 'maint-0.3.5' into maint-0.4.1

e63bfca... by Nick Mathewson <email address hidden>

Travis: temporarily fix stem version to d1174a83c2dcb7b8

This is a workaround for https://github.com/torproject/stem/issues/63

d41f1cd... by Nick Mathewson <email address hidden>

btrack_orconn_cevent.c: Add a missing "break;"

633366e... by Nick Mathewson <email address hidden>

Merge branch 'maint-0.3.5' into maint-0.4.1

dd795fb... by Nick Mathewson <email address hidden>

changes file for bug 34078.

79ff2b6... by Nick Mathewson <email address hidden>

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.)

dd0ee01... by Nick Mathewson <email address hidden>

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.

cc39744... by Nick Mathewson <email address hidden>

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;