summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-19Merge branch 'ticket34255_043' into maint-0.4.3Nick Mathewson
2020-05-19Doxygen: fix unbalanced groups.Nick Mathewson
Closes ticket 34255.
2020-05-17Declare variables in for loops in rend_service_dump_stats()Neel Chauhan
2020-05-16Fix spacing in if statement in tor_version_parse()Neel Chauhan
2020-05-16Fix spacing in if statement in port_parse_config()Neel Chauhan
2020-05-15Merge branch 'maint-0.4.3'Nick Mathewson
2020-05-15Add a changes file for 34233.Nick Mathewson
This bug was merged back to 0.3.5 with our #34078 fix, but only released in 0.4.3.5, so the changes file goes here.
2020-05-15Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2020-05-15Merge branch 'maint-0.4.3'Nick Mathewson
2020-05-15Merge branch 'maint-0.4.2' into maint-0.4.3Nick Mathewson
2020-05-15Merge branch 'maint-0.3.5' into maint-0.4.1maint-0.4.1Nick Mathewson
2020-05-15Fix use of non-portable == in configure.ac.Nick Mathewson
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-15Merge branch 'maint-0.4.3'Nick Mathewson
"ours" to avoid version bump
2020-05-15bump to 0.4.3.5-devNick Mathewson
2020-05-14remove changes files that have already appeared in 0.4.3.Nick Mathewson
2020-05-14remove 0.4.3.3-alpha from the release notes: alphas do not go there.Nick Mathewson
2020-05-14Merge branch 'maint-0.4.3'Nick Mathewson
"ours" to avoid 0.4.3.5 version bump.
2020-05-14Fix a python warning in format_changelog.py.Nick Mathewson
2020-05-14bump to 0.4.3.5Nick Mathewson
2020-05-14Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2020-05-14Merge branch 'maint-0.3.5' into maint-0.4.1Nick Mathewson
2020-05-14Merge branch 'maint-0.4.3'Nick Mathewson
2020-05-14Merge branch 'maint-0.4.2' into maint-0.4.3Nick Mathewson
2020-05-14Travis: temporarily fix stem version to d1174a83c2dcb7b8Nick Mathewson
This is a workaround for https://github.com/torproject/stem/issues/63
2020-05-12Merge branch 'bug34130_035'Nick Mathewson
2020-05-12Fix crash when tor is compiled with NSS and seccomp sandbox is enabledDaniel Pinto
Adds seccomp rules for socket and getpeername used by NSS
2020-05-12Merge remote-tracking branch 'tor-github/pr/1885/head'Nick Mathewson
2020-05-08Improve logging of included config filesDaniel Pinto
2020-05-08Add documentation about %include and seccomp sandbox limitationsDaniel Pinto
2020-05-07Merge remote-tracking branch 'tor-github/pr/1880/head'Nick Mathewson
2020-05-06Merge branch 'maint-0.4.3'Nick Mathewson
2020-05-06Fix a boolean logic error when logging about invalid hostnames.Nick Mathewson
Fixes bug 34131; bugfix on 0.4.3.1-alpha.
2020-05-06connection_or_finished_flushing(): add a missing "break;"Nick Mathewson
This one is harmless like the others (so far)
2020-05-06Merge branch 'maint-0.4.2' into maint-0.4.3Nick Mathewson
2020-05-06Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2020-05-06btrack_orconn_cevent.c: Add a missing "break;"Nick Mathewson
2020-05-06Merge branch 'maint-0.4.3'Nick Mathewson
2020-05-06Merge branch 'maint-0.4.2' into maint-0.4.3Nick Mathewson
2020-05-06Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2020-05-06Merge branch 'maint-0.3.5' into maint-0.4.1Nick Mathewson
2020-05-06changes file for bug 34078.Nick Mathewson
2020-05-06Merge branch 'maint-0.4.3'Nick Mathewson
Amazingly, this time we had no merge conflicts with "falls through" comments.
2020-05-06Use __attribute__((fallthrough)) rather than magic GCC comments.Nick Mathewson
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.3 version.)
2020-05-06Merge branch 'maint-0.4.2' into maint-0.4.3Nick Mathewson
This is an "ours" merge to avoid taking the maint-0.4.2 version of the 34078 fix.
2020-05-06Use __attribute__((fallthrough)) rather than magic GCC comments.Nick Mathewson
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-06Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
This is an "ours" merge to avoid taking the 0.4.1 version of the 34078 fix.
2020-05-06Use __attribute__((fallthrough)) rather than magic GCC comments.Nick Mathewson
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-06Merge branch 'maint-0.3.5' into maint-0.4.1Nick Mathewson
This is an "ours" merge to avoid taking the 0.3.5 fix for 34078.
2020-05-06Use __attribute__((fallthrough)) rather than magic GCC comments.Nick Mathewson
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-06Merge branch 'maint-0.4.3'Nick Mathewson