5d0c1ba019
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-30 15:54:21 -04:00
cafb999810
bump to 0.4.0.5
2019-04-30 15:53:53 -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
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
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
e8b26bb71b
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-19 12:00:55 +10:00
24b68b4777
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-19 12:00:50 +10:00
231036a110
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-19 12:00:41 +10:00
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
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
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
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
ba15b2f238
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-17 16:46:44 +10:00
c72f0cd5c7
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-17 16:46:40 +10:00
37d7daa3cd
changes: update the changes file for 30001
2019-04-17 12:34:33 +10:00
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
0c42ddf28c
fixup! Even more diagnostic messages for bug 28223.
...
Use TOR_PRIuSZ in place of %zu.
2019-04-15 15:21:18 -04:00
6b8d01693a
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-15 13:56:48 +03:00
15591e1bbd
Merge branch 'tor-github/pr/948' into maint-0.4.0
2019-04-15 13:56:37 +03:00
1177818c32
Merge branch 'rust-panic1-035' into rust-panic1-040
2019-04-15 10:18:59 +10:00
a6d0420f7c
Merge branch 'rust-panic1-034' into rust-panic1-035
...
Trivial merge: a blank line was removed between 0.3.4 and 0.3.5.
2019-04-15 10:18:01 +10:00
5ab5c8ec15
Merge branch 'rust-panic1' into rust-panic1-034
2019-04-15 10:15:02 +10:00
8ff6ab0a39
changes: file for 30117
2019-04-12 08:38:30 -04:00
6d01879fe1
Travis: expand "make test-stem", so timelimit can signal python on timeout
...
Unlike kill, timelimit can only signal the process it launches. So we need
timelimit to launch python, not make.
Closes ticket 30117; diagnostic for 29437.
2019-04-12 08:38:30 -04:00
5ae1389465
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-11 17:06:26 -04:00
40471d73e5
bump to 0.4.0.4-rc-dev
2019-04-11 17:05:38 -04:00
dac18e0b20
More changelog edits (thanks, seborn!)
2019-04-11 14:04:02 -04:00
5d83c34ef9
Light editing on changelog
2019-04-11 10:26:41 -04:00
6ef3819798
Travis: use stem backtrace signals with timelimit
...
Part of 30117.
2019-04-11 11:59:30 +10:00
dcce26331c
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-10 11:52:23 -04:00
b2fc57426c
Bump version to 0.4.0.4-rc
2019-04-10 11:51:49 -04:00
4000666eee
run format_changelog
2019-04-10 11:42:16 -04:00
594cc1de30
Start a changelog for 0.4.0.4-rc
2019-04-10 11:41:49 -04:00
Nick Mathewson
George Kadianakis
Alexander Færøy
teor