summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-05-02Add bug29930 into changelog/releasenotestor-0.4.0.5Nick Mathewson
2019-05-02Release blurb and date for 0.4.0.5Nick Mathewson
2019-04-30Merge branch 'maint-0.4.0' into release-0.4.0Nick Mathewson
2019-04-30bump to 0.4.0.5Nick Mathewson
2019-04-30Merge branch 'release-0.4.0' of git-rw.torproject.org:/tor into release-0.4.0Nick Mathewson
2019-04-30Fold changes entries into releasenotes and changelogNick Mathewson
2019-04-30Merge branch 'maint-0.4.0' into release-0.4.0George Kadianakis
2019-04-30Merge branch 'tor-github/pr/978' into maint-0.4.0George Kadianakis
2019-04-29Start on a release notes for a stable 0.4.0.x release.Nick Mathewson
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-29Merge branch 'maint-0.4.0' into release-0.4.0Nick Mathewson
2019-04-29Merge remote-tracking branch 'tor-github/pr/974' into maint-0.4.0Nick Mathewson
2019-04-25Merge branch 'maint-0.4.0' into release-0.4.0George Kadianakis
2019-04-25Merge branch 'tor-github/pr/960' into maint-0.4.0George Kadianakis
2019-04-25Lower log level of unlink() errors in networkstatus_set_current_consensus().Alexander Færøy
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-23Stop looking for scripts in the build directory during "make shellcheck"teor
Fixes bug 30263; bugfix on 0.4.0.1-alpha.
2019-04-19Merge branch 'maint-0.4.0' into release-0.4.0teor
2019-04-19Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-04-19Merge branch 'maint-0.3.4' into maint-0.3.5teor
2019-04-19Merge branch 'maint-0.2.9' into maint-0.3.4teor
"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-19Merge remote-tracking branch 'tor-github/pr/710' into maint-0.3.5teor
2019-04-19Merge remote-tracking branch 'tor-github/pr/726' into maint-0.3.5teor
2019-04-19Merge remote-tracking branch 'tor-github/pr/745' into maint-0.3.5teor
2019-04-19Merge remote-tracking branch 'tor-github/pr/947' into maint-0.3.5teor
2019-04-19Merge remote-tracking branch 'tor-github/pr/946' into maint-0.3.4teor
2019-04-19Merge remote-tracking branch 'tor-github/pr/638' into maint-0.3.4teor
2019-04-19Merge remote-tracking branch 'tor-github/pr/791' into maint-0.3.4teor
2019-04-19Merge remote-tracking branch 'tor-github/pr/792' into maint-0.2.9teor
2019-04-19Merge branch 'maint-0.2.9' into maint-0.3.4teor
"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-19Merge remote-tracking branch 'tor-github/pr/772' into maint-0.2.9teor
2019-04-18Merge branch 'maint-0.4.0' into release-0.4.0George Kadianakis
2019-04-18Merge branch 'tor-github/pr/891' into maint-0.4.0George Kadianakis
2019-04-17Merge branch 'maint-0.4.0' into release-0.4.0teor
2019-04-17Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-04-17changes: update the changes file for 30001teor
2019-04-15In warn_if_nul_found, log surrounding context.Nick Mathewson
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-15fixup! Even more diagnostic messages for bug 28223.Nick Mathewson
Use TOR_PRIuSZ in place of %zu.
2019-04-15Merge branch 'maint-0.4.0' into release-0.4.0George Kadianakis
2019-04-15Merge branch 'tor-github/pr/948' into maint-0.4.0George Kadianakis
2019-04-15Merge branch 'rust-panic1-035' into rust-panic1-040teor
2019-04-15Merge branch 'rust-panic1-034' into rust-panic1-035teor
Trivial merge: a blank line was removed between 0.3.4 and 0.3.5.
2019-04-15Merge branch 'rust-panic1' into rust-panic1-034teor
2019-04-12changes: file for 30117teor
2019-04-12Travis: expand "make test-stem", so timelimit can signal python on timeoutteor
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-11Merge branch 'maint-0.4.0' into release-0.4.0Nick Mathewson
2019-04-11bump to 0.4.0.4-rc-devNick Mathewson
2019-04-11More changelog edits (thanks, seborn!)tor-0.4.0.4-rcNick Mathewson
2019-04-11Light editing on changelogNick Mathewson
2019-04-11Travis: use stem backtrace signals with timelimitteor
Part of 30117.
2019-04-10Merge branch 'maint-0.4.0' into release-0.4.0Nick Mathewson
2019-04-10Bump version to 0.4.0.4-rcNick Mathewson