torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
31,780 Commits 53 Branches 631 Tags
63e0599c5710e04ecb98ff87c09d613feeda2620
Commit Graph

31780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 63e0599c57 Merge branch 'maint-0.4.0' into release-0.4.0 2019-05-17 08:10:16 -04:00
Nick Mathewson c7f9f7e542 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-05-17 08:10:16 -04:00
Nick Mathewson e5deb2bbc7 Merge branch 'maint-0.3.4' into maint-0.3.5 2019-05-17 08:10:16 -04:00
Nick Mathewson a521c42788 Merge branch 'maint-0.2.9' into maint-0.3.4 2019-05-17 08:10:15 -04:00
Karsten Loesing 4e262196a8 Update geoip and geoip6 to the May 13 2019 database. 2019-05-17 08:52:13 +02:00
Nick Mathewson 34e03b9ecc Merge branch 'maint-0.4.0' into release-0.4.0 2019-05-15 07:41:42 -04:00
Nick Mathewson 7e3f7ab406 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-05-15 07:41:42 -04:00
Nick Mathewson 6945f2b3ef Merge branch 'bug30475_035' into maint-0.3.5 2019-05-15 07:41:34 -04:00
George Kadianakis 72e799d28e Merge branch 'maint-0.4.0' into release-0.4.0 2019-05-15 13:46:19 +03:00
George Kadianakis cd264e145b Merge branch 'tor-github/pr/1013' into maint-0.4.0 2019-05-15 13:45:39 +03:00
Nick Mathewson ff55840343 Don't pass a NULL into a %s when logging client auth file load failure 
Fortunately, in 0.3.5.1-alpha we improved logging for various
failure cases involved with onion service client auth.

Unfortunately, for this one, we freed the file right before logging
its name.

Fortunately, tor_free() sets its pointer to NULL, so we didn't have
a use-after-free bug.

Unfortunately, passing NULL to %s is not defined.

Fortunately, GCC 9.1.1 caught the issue!

Unfortunately, nobody has actually tried building Tor with GCC 9.1.1
before. Or if they had, they didn't report the warning.

Fixes bug 30475; bugfix on 0.3.5.1-alpha.
 2019-05-10 17:47:43 -04:00
Nick Mathewson de01c06296 Merge branch 'maint-0.4.0' into release-0.4.0 2019-05-02 14:33:22 -04:00
Nick Mathewson 2b54733dc0 Bump to 0.4.0.5-dev 2019-05-02 14:32:55 -04:00
Nick Mathewson bf071e34aa Add bug29930 into changelog/releasenotes tor-0.4.0.5 2019-05-02 08:50:45 -04:00
Nick Mathewson ed2e84c702 Release blurb and date for 0.4.0.5 2019-05-02 08:49:08 -04:00
Nick Mathewson 5d0c1ba019 Merge branch 'maint-0.4.0' into release-0.4.0 2019-04-30 15:54:21 -04:00
Nick Mathewson cafb999810 bump to 0.4.0.5 2019-04-30 15:53:53 -04:00
Nick Mathewson 672c72d7d7 Merge branch 'release-0.4.0' of git-rw.torproject.org:/tor into release-0.4.0 2019-04-30 15:52:39 -04:00
Nick Mathewson 955d73d1e9 Fold changes entries into releasenotes and changelog 2019-04-30 15:49:26 -04:00
George Kadianakis 603074ea18 Merge branch 'maint-0.4.0' into release-0.4.0 2019-04-30 19:26:30 +03:00
George Kadianakis e1d4e2badb Merge branch 'tor-github/pr/978' into maint-0.4.0 2019-04-30 19:26:14 +03:00
Nick Mathewson a5b323acbb Start on a release notes for a stable 0.4.0.x release. 
This is the standard beginning, made by sorting the entries from the
previous 0.4.0 changelogs, and removing all those that were bugfixes on
the 0.4.0.x series itself.
 2019-04-29 12:05:16 -04:00
Nick Mathewson 83f10c77da Merge branch 'maint-0.4.0' into release-0.4.0 2019-04-29 10:15:11 -04:00
Nick Mathewson 593d29920e Merge remote-tracking branch 'tor-github/pr/974' into maint-0.4.0 2019-04-29 10:15:03 -04:00
George Kadianakis 88d6c2568d Merge branch 'maint-0.4.0' into release-0.4.0 2019-04-25 15:47:07 +03:00
George Kadianakis a39789a02c Merge branch 'tor-github/pr/960' into maint-0.4.0 2019-04-25 15:46:45 +03:00
Alexander Færøy 0429072495 Lower log level of unlink() errors in networkstatus_set_current_consensus(). 
In this patch we lower the log level of the failures for the three calls
to unlink() in networkstatus_set_current_consensus(). These errors might
trigger on Windows because the memory mapped consensus file keeps the
file in open state even after we have close()'d it. Windows will then
error on the unlink() call with a "Permission denied" error.

The consequences of ignoring these errors is that we leave an unused
file around on the file-system, which is an easier way to fix this
problem right now than refactoring networkstatus_set_current_consensus().

See: https://bugs.torproject.org/29930
 2019-04-25 01:59:37 +02:00
teor 1788343aff Stop looking for scripts in the build directory during "make shellcheck" 
Fixes bug 30263; bugfix on 0.4.0.1-alpha.
 2019-04-23 12:31:14 +10:00
teor e8b26bb71b Merge branch 'maint-0.4.0' into release-0.4.0 2019-04-19 12:00:55 +10:00
teor 24b68b4777 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-04-19 12:00:50 +10:00
teor 231036a110 Merge branch 'maint-0.3.4' into maint-0.3.5 2019-04-19 12:00:41 +10:00
teor cbce8dedd3 Merge branch 'maint-0.2.9' into maint-0.3.4 
"ours" merge, to avoid taking any changes from PR 792 in 0.3.4.
(We already merged PR 791 for 29665 into 0.3.4.)
 2019-04-19 11:59:18 +10:00
teor 742b5b32d5 Merge remote-tracking branch 'tor-github/pr/710' into maint-0.3.5 2019-04-19 11:52:48 +10:00
teor cb084de5e5 Merge remote-tracking branch 'tor-github/pr/726' into maint-0.3.5 2019-04-19 11:51:05 +10:00
teor 2ae67fee42 Merge remote-tracking branch 'tor-github/pr/745' into maint-0.3.5 2019-04-19 11:48:41 +10:00
teor 4a66c2d636 Merge remote-tracking branch 'tor-github/pr/947' into maint-0.3.5 2019-04-19 11:47:50 +10:00
teor 116970dda7 Merge remote-tracking branch 'tor-github/pr/946' into maint-0.3.4 2019-04-19 11:47:10 +10:00
teor b1762f8d12 Merge remote-tracking branch 'tor-github/pr/638' into maint-0.3.4 2019-04-19 11:44:38 +10:00
teor 8154b33f9c Merge remote-tracking branch 'tor-github/pr/791' into maint-0.3.4 2019-04-19 11:43:46 +10:00
teor 2460b4461f Merge remote-tracking branch 'tor-github/pr/792' into maint-0.2.9 2019-04-19 11:42:09 +10:00
teor 4d504bf098 Merge branch 'maint-0.2.9' into maint-0.3.4 
"ours" merge, to avoid taking any changes from PR 772 in 0.3.4.
(We already merged a different fix for 23790 into 0.3.2 and later.)
 2019-04-19 11:39:17 +10:00
teor ec213ae8a0 Merge remote-tracking branch 'tor-github/pr/772' into maint-0.2.9 2019-04-19 11:38:52 +10:00
George Kadianakis 3444371dd9 Merge branch 'maint-0.4.0' into release-0.4.0 2019-04-18 13:22:23 +03:00
George Kadianakis 6a179b1072 Merge branch 'tor-github/pr/891' into maint-0.4.0 2019-04-18 13:21:59 +03:00
teor ba15b2f238 Merge branch 'maint-0.4.0' into release-0.4.0 2019-04-17 16:46:44 +10:00
teor c72f0cd5c7 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-04-17 16:46:40 +10:00
teor 37d7daa3cd changes: update the changes file for 30001 2019-04-17 12:34:33 +10:00
Nick Mathewson 950d890f77 In warn_if_nul_found, log surrounding context. 
We need to encode here instead of doing escaped(), since fwict
escaped() does not currently handle NUL bytes.

Also, use warn_if_nul_found in more cases to avoid duplication.
 2019-04-15 15:33:09 -04:00
Nick Mathewson 0c42ddf28c fixup! Even more diagnostic messages for bug 28223. 
Use TOR_PRIuSZ in place of %zu.
 2019-04-15 15:21:18 -04:00
George Kadianakis 6b8d01693a Merge branch 'maint-0.4.0' into release-0.4.0 2019-04-15 13:56:48 +03:00