0fe3b373ac
Merge branch 'maint-0.4.0' into release-0.4.0
2019-06-10 18:33:26 -04:00
430dd2da6e
Merge branch 'bug30713_035' into bug30713_040
2019-06-10 20:50:53 +10:00
be0a4be276
Travis: Skip test_rebind on macOS builds
...
Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental variable
is set.
Skip test_rebind on macOS in Travis builds, because it is unreliable
on macOS on Travis.
Fixes bug 30713; bugfix on 0.3.5.1-alpha.
2019-06-10 20:49:59 +10:00
463ded569c
Merge branch 'maint-0.4.0' into release-0.4.0
2019-06-05 16:24:10 -04:00
6a6f7eb671
Merge remote-tracking branch 'tor-github/pr/988' into maint-0.4.0
2019-06-05 16:22:52 -04:00
d63c17f2af
Merge remote-tracking branch 'tor-github/pr/989' into maint-0.4.0
2019-06-05 16:22:29 -04:00
e51b57ee04
Merge remote-tracking branch 'tor-github/pr/952' into maint-0.4.0
2019-06-05 16:16:34 -04:00
2300a619a5
Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.4.0
2019-06-05 16:13:53 -04:00
851e881f01
Merge remote-tracking branch 'tor-github/pr/971' into maint-0.4.0
2019-06-05 16:12:07 -04:00
a56d7e37aa
Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.4.0
2019-06-05 16:10:51 -04:00
121d271dc6
Merge branch 'maint-0.4.0' into release-0.4.0
2019-05-29 21:20:02 +03:00
00108b75d4
Merge branch 'tor-github/pr/924' into maint-0.4.0
2019-05-29 21:19:56 +03:00
245dccb77d
Merge remote-tracking branch 'nickm/ticket30454_034_01_squashed' into ticket30454_035_01
2019-05-22 11:43:55 -04:00
9f52b87518
hs: Add changes file for #30454
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2019-05-20 08:56:34 -04:00
e5deb2bbc7
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-05-17 08:10:16 -04:00
63e0599c57
Merge branch 'maint-0.4.0' into release-0.4.0
2019-05-17 08:10:16 -04:00
c7f9f7e542
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-05-17 08:10:16 -04:00
a521c42788
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-05-17 08:10:15 -04:00
4e262196a8
Update geoip and geoip6 to the May 13 2019 database.
2019-05-17 08:52:13 +02:00
72e799d28e
Merge branch 'maint-0.4.0' into release-0.4.0
2019-05-15 13:46:19 +03:00
cd264e145b
Merge branch 'tor-github/pr/1013' into maint-0.4.0
2019-05-15 13:45:39 +03:00
1b16fcb70c
Add a --list-modules command
...
Closes ticket 30452.
2019-05-14 19:19:53 -04:00
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
bf071e34aa
Add bug29930 into changelog/releasenotes
2019-05-02 08:50:45 -04:00
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
955d73d1e9
Fold changes entries into releasenotes and changelog
2019-04-30 15:49:26 -04:00
603074ea18
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-30 19:26:30 +03:00
e1d4e2badb
Merge branch 'tor-github/pr/978' into maint-0.4.0
2019-04-30 19:26:14 +03:00
b05b165a75
Add changes file
2019-04-30 09:16:36 +03:00
821dd54586
Merge branch 'bug30316_035' into bug30316_040
...
Fixes conflicts and also moves bandwidth-file-digest.
2019-04-29 14:34:03 -04:00
0ab4dc7ef7
Move bandwidth-file-headers line to appear in the correct vote section
...
Fixes bug 30316; bugfix on 0.3.5.1-alpha.
2019-04-29 14:31:09 -04:00
83f10c77da
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-29 10:15:11 -04:00
593d29920e
Merge remote-tracking branch 'tor-github/pr/974' into maint-0.4.0
2019-04-29 10:15:03 -04:00
88d6c2568d
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-25 15:47:07 +03:00
a39789a02c
Merge branch 'tor-github/pr/960' into maint-0.4.0
2019-04-25 15:46:45 +03:00
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
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
9a97b5ff56
Travis: Show stem's tor log after failure
...
Closes ticket 30234.
2019-04-22 11:48:07 +10:00
231036a110
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-19 12:00:41 +10:00
742b5b32d5
Merge remote-tracking branch 'tor-github/pr/710' into maint-0.3.5
2019-04-19 11:52:48 +10:00
cb084de5e5
Merge remote-tracking branch 'tor-github/pr/726' into maint-0.3.5
2019-04-19 11:51:05 +10:00
2ae67fee42
Merge remote-tracking branch 'tor-github/pr/745' into maint-0.3.5
2019-04-19 11:48:41 +10:00
4a66c2d636
Merge remote-tracking branch 'tor-github/pr/947' into maint-0.3.5
2019-04-19 11:47:50 +10:00
116970dda7
Merge remote-tracking branch 'tor-github/pr/946' into maint-0.3.4
2019-04-19 11:47:10 +10:00
b1762f8d12
Merge remote-tracking branch 'tor-github/pr/638' into maint-0.3.4
2019-04-19 11:44:38 +10:00
8154b33f9c
Merge remote-tracking branch 'tor-github/pr/791' into maint-0.3.4
2019-04-19 11:43:46 +10:00
2460b4461f
Merge remote-tracking branch 'tor-github/pr/792' into maint-0.2.9
2019-04-19 11:42:09 +10:00
ec213ae8a0
Merge remote-tracking branch 'tor-github/pr/772' into maint-0.2.9
2019-04-19 11:38:52 +10:00
3444371dd9
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-18 13:22:23 +03:00
6a179b1072
Merge branch 'tor-github/pr/891' into maint-0.4.0
2019-04-18 13:21:59 +03:00
Nick Mathewson
teor
George Kadianakis
David Goulet
Karsten Loesing
rl1987
Alexander Færøy