Nick Mathewson
a2bd93456f
Changes file for coccinelle scripts
2019-09-11 18:50:43 -04:00
David Goulet
41261c3b5c
Merge branch 'tor-github/pr/1296'
2019-09-11 09:42:31 -04:00
Nick Mathewson
d545fe1992
Changes file for 31625 (config flag refactor)
2019-09-11 09:42:19 -04:00
David Goulet
049705fc1c
Merge branch 'tor-github/pr/1311'
2019-09-11 09:36:28 -04:00
George Kadianakis
3b32f2508c
Merge branch 'tor-github/pr/1307'
2019-09-11 16:19:21 +03:00
Nick Mathewson
e7565855c0
Merge branch 'ticket31578' into ticket31578_merged
2019-09-11 08:59:29 -04:00
teor
987768b077
Merge branch 'bug31615_041' into bug31615_master
...
Merged modified lines from bug31615_041, and unmodified lines
from master.
2019-09-10 09:03:37 +10:00
teor
7e22d99346
Merge branch 'bug31615_040' into bug31615_041
...
Merged modified lines from bug31615_040, and unmodified lines
from maint-0.4.1.
2019-09-10 08:43:13 +10:00
David Goulet
409df19b5a
build: The <sys/sysctl.h> is now deprecated on Linux
...
Closes #31673
2019-09-09 17:07:08 -04:00
David Goulet
796a9b37ea
Merge branch 'tor-github/pr/1264'
2019-09-09 14:53:12 -04:00
Nick Mathewson
a642a4cbd7
Merge branch 'ticket30924_042_04_squashed' into ticket30924_042_04_squashed_merged
2019-09-09 11:10:53 -04:00
David Goulet
1e7c7870e8
Merge branch 'tor-github/pr/1287'
2019-09-09 10:51:19 -04:00
teor
612b0a4139
subsys: Make the subsystem init order match the module dependencies
...
Fix levels for subsystems that depend on log/err
* winprocess (security) doesn't use err:
* call windows process security APIs as early as possible
* init err after winprocess
* move wallclock so it's still after err
* network and time depend on log:
* make sure that network and time can use logging.
* init network and time after log
Add comments explaining the module init order.
Fixes bug 31615; bugfix on 0.4.0.1-alpha.
2019-09-06 16:58:53 +10:00
Nick Mathewson
380d178e53
changes file for ticket31477
2019-09-05 16:20:31 -04:00
George Kadianakis
c750ec20ab
Merge branch 'tor-github/pr/1291'
2019-09-05 17:09:20 +03:00
George Kadianakis
c29f05b159
Merge branch 'tor-github/pr/1292'
2019-09-05 17:06:58 +03:00
George Kadianakis
cdd7e88970
Merge branch 'tor-github/pr/1261'
2019-09-05 17:02:53 +03:00
Neel Chauhan
be4a60945d
Check IPv6 exit policies on microdescriptors in node_exit_policy_rejects_all()
2019-09-05 17:02:45 +03:00
teor
896a1ac50b
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-09-05 14:47:54 +10:00
teor
0461837149
Merge remote-tracking branch 'tor-github/pr/1271' into maint-0.3.5
2019-09-05 14:47:34 +10:00
teor
c08d3e46ca
Merge commit '73890a86ef' into maint-0.4.1
...
tor-github/pr/1283, with the following changes:
* cherry-pick the merge commit in 1283 on top of...
* tor-github/pr/1174, but with the last commit re-worded to remove
the fixup, because fixups break our push rules.
This is an "ours" merge, except for the bugfix version change in
changes/bug30649.
2019-09-05 12:04:27 +10:00
George Kadianakis
73890a86ef
Merge branch 'bug30649_040' into bug30649_maint_041
2019-09-05 11:48:03 +10:00
George Kadianakis
61082c059c
Fix bugfix version in Bug 30649: Changes file.
2019-09-05 11:46:25 +10:00
teor
1203e137be
Merge commit '763fd0ad66' into maint-0.4.0
...
tor-github/pr/1174, but with the last commit re-worded to remove
the fixup, because fixups break our push rules.
2019-09-05 11:42:26 +10:00
George Kadianakis
763fd0ad66
Fix bugfix version in Bug 30649: Changes file.
2019-09-05 11:41:45 +10:00
teor
4b1d2ba979
changes: file for 30967
2019-09-05 11:15:30 +10:00
Nick Mathewson
106b75aa53
changes file for 31532
2019-09-04 12:06:27 -04:00
Nick Mathewson
870874fec8
config: Make CLEAR with a nonempty value into a nonfatal assertion.
...
When we parse a CLEAR line (e.g., "/OrPort" or /OrPort blah blah"),
we always suppress the value, even if one exists. That means that
the block of code was meant to handle CLEAR lines didn't actually do
anything, since we previously handled them the same way as with
other empty values.
Closes ticket 31529.
2019-09-04 11:28:21 -04:00
David Goulet
34f3fcef40
Merge branch 'tor-github/pr/1290'
2019-09-04 10:33:49 -04:00
Nick Mathewson
4bcfa286f6
changes file for 31240
2019-09-04 10:31:45 -04:00
Nick Mathewson
46a3820652
Merge remote-tracking branch 'tor-github/pr/1270'
2019-09-04 09:52:35 -04:00
David Goulet
a816742f37
Merge branch 'maint-0.4.1'
2019-09-04 08:33:28 -04:00
David Goulet
630bb113a0
Merge branch 'tor-github/pr/1271' into maint-0.4.1
2019-09-04 08:33:10 -04:00
teor
193c74faf9
Merge branch 'bug31571_041' into bug31571_master
2019-09-04 13:57:39 +10:00
teor
abe1f4f23e
Merge branch 'bug31571_040' into bug31571_041
2019-09-04 13:57:36 +10:00
teor
0cee6f498c
Merge branch 'bug31571_035' into bug31571_040
2019-09-04 13:57:31 +10:00
teor
a836dd2530
Merge branch 'maint-0.3.5' into bug31571_035
2019-09-04 13:57:15 +10:00
Nick Mathewson
651bbe8a0d
Practracker: only consider files under "src/"
2019-09-02 15:40:35 -04:00
Nick Mathewson
78307ed186
Merge remote-tracking branch 'tor-github/pr/1272'
2019-09-02 14:13:32 -04:00
Nick Mathewson
01bda9bed1
Merge branch 'maint-0.4.1'
2019-09-02 14:11:32 -04:00
Nick Mathewson
e3a458e441
Merge branch 'ticket12399_035' into maint-0.4.1
2019-09-02 14:11:18 -04:00
rl1987
05fa1689eb
Change loglevel of message 'Hash of session info was not as expected'
2019-09-02 14:09:39 -04:00
teor
a52a5e0099
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-30 23:33:01 +10:00
teor
1132dc9f75
Merge remote-tracking branch 'tor-github/pr/1181' into maint-0.3.5
2019-08-30 23:24:05 +10:00
teor
b66712d85b
Merge remote-tracking branch 'tor-github/pr/1117' into maint-0.3.5
2019-08-30 23:22:18 +10:00
teor
4662cbec7b
Merge remote-tracking branch 'tor-github/pr/1114' into maint-0.3.5
2019-08-30 23:20:59 +10:00
teor
c55591825f
torerr: Try harder to flush raw assert messages before process termination
...
Some platforms (macOS, maybe others?) can swallow the last write before an
abort. This issue is probably caused by a race condition between write
buffer cache flushing, and process termination. So we write an extra
newline, to make sure that the message always gets through.
Fixes bug 31571; bugfix on 0.3.5.1-alpha.
2019-08-30 21:51:11 +10:00
David Goulet
88a8deb420
Merge branch 'tor-github/pr/1236'
2019-08-29 12:58:25 -04:00
David Goulet
7c99a4ddde
Merge branch 'maint-0.4.1'
2019-08-29 08:55:58 -04:00
David Goulet
ff905f8e1e
Merge branch 'tor-github/pr/1256' into maint-0.4.1
2019-08-29 08:55:31 -04:00
