Nick Mathewson
632d6cbc43
Merge remote-tracking branch 'teor/doc24596'
2017-12-12 09:07:49 -05:00
teor
2ff706ba02
Make configure log messages less confusing during static builds
...
Closes #24558 .
2017-12-12 12:43:53 +11:00
teor
7b59199663
Fix a typo in CodingStandards.md
...
Closes #24596 .
2017-12-12 12:32:50 +11:00
Alexander Færøy
cbc465a3d1
Simplify explicit conditional checks into an inlined function.
...
This patch lifts the check for whether a given log file (`logfile_t`) is
an "external logfile" (handled by an external logging system such as
syslog, android's logging subsystem, or as an external C callback
function) into a function on its own.
See: https://bugs.torproject.org/24362
2017-12-12 01:17:57 +00:00
Nick Mathewson
eecfed0cd2
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-11 16:56:31 -05:00
Nick Mathewson
f7151387d9
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-11 16:56:31 -05:00
Nick Mathewson
cdee62da9e
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-11 16:56:31 -05:00
Nick Mathewson
4593f5a6e1
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-11 16:56:31 -05:00
Nick Mathewson
da38904efb
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-11 16:56:31 -05:00
Nick Mathewson
a6587e9070
Merge branch 'maint-0.3.2'
2017-12-11 16:56:31 -05:00
Nick Mathewson
1deda2106b
Merge branch 'bug24167_025' into maint-0.2.5
2017-12-11 16:56:28 -05:00
Nick Mathewson
43fb8fc5cb
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-11 16:54:14 -05:00
Nick Mathewson
422ff8f922
Merge branch 'maint-0.3.2'
2017-12-11 16:54:14 -05:00
Nick Mathewson
eaaa1108a3
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-11 16:54:14 -05:00
Nick Mathewson
04524443d0
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-11 16:54:14 -05:00
Nick Mathewson
2ea573ece8
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-11 16:54:14 -05:00
Nick Mathewson
bc1ea4f470
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-11 16:54:11 -05:00
Nick Mathewson
f5d4bdf305
Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5
2017-12-11 16:53:02 -05:00
Nick Mathewson
e553bf3ce4
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-11 16:51:58 -05:00
Nick Mathewson
16ec4da68c
Merge branch 'maint-0.3.2'
2017-12-11 16:51:58 -05:00
Nick Mathewson
736e7299ce
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-11 16:51:58 -05:00
Nick Mathewson
7fcb222ab7
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-11 16:51:58 -05:00
Nick Mathewson
7e486dd6f7
Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9
2017-12-11 16:51:54 -05:00
Nick Mathewson
bfc9be4c77
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-11 16:50:48 -05:00
Nick Mathewson
abcc7032ce
Merge branch 'maint-0.3.2'
2017-12-11 16:50:48 -05:00
Nick Mathewson
f7b41bcdf0
Merge branch 'bug24086_031' into maint-0.3.1
2017-12-11 16:49:01 -05:00
Nick Mathewson
828333e38c
Merge remote-tracking branch 'public/bug24099_031' into maint-0.3.1
2017-12-11 16:48:44 -05:00
Nick Mathewson
dc79d5299d
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-11 16:46:00 -05:00
Nick Mathewson
3b2f4d1391
Merge branch 'maint-0.3.2'
2017-12-11 16:46:00 -05:00
Nick Mathewson
d2031f2c60
Merge remote-tracking branch 'public/bug23817_031' into maint-0.3.1
2017-12-11 16:45:54 -05:00
Nick Mathewson
d5400d50e7
Merge branch 'maint-0.3.2'
2017-12-11 16:43:51 -05:00
Nick Mathewson
acc462c965
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-11 16:43:48 -05:00
Nick Mathewson
ae608408e9
Merge remote-tracking branch 'asn/bug23862_031' into maint-0.3.1
2017-12-11 16:43:41 -05:00
Nick Mathewson
8e100d1a17
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid taking the 030 version of 23862.
2017-12-11 16:43:24 -05:00
Nick Mathewson
c55a054236
Merge remote-tracking branch 'asn/bug23862_030' into maint-0.3.0
2017-12-11 16:41:28 -05:00
Nick Mathewson
418d8bbe92
Merge branch 'stack_fixes_032_v2' into maint-0.3.2
2017-12-11 16:25:04 -05:00
Nick Mathewson
35d56a127d
Add a changelog for the STACK fixes
2017-12-11 16:23:11 -05:00
Nick Mathewson
f539d89fd9
Move subtraction in rephist to try to avoid STACK warning
...
(I do not know why this one is happening)
2017-12-11 16:23:11 -05:00
Nick Mathewson
3da15bcbe8
Stop checking for sandbox:new_element() failures: it can't fail.
...
(It can't fail because the tor_malloc*() family of functions can
never return NULL)
Found with STACK
2017-12-11 16:06:25 -05:00
Nick Mathewson
472473ec5d
transport_new() cannot fail; do not check for it to fail.
...
(It can't fail because the tor_malloc*() family of functions can
never return NULL)
Found with STACK.
2017-12-11 16:06:00 -05:00
Nick Mathewson
252db6ad26
Merge branch 'maint-0.3.2'
2017-12-11 16:02:10 -05:00
David Goulet
057139d383
sched: Avoid integer overflow when computing tcp_space
...
In KIST, we could have a small congestion window value than the unacked
packets leading to a integer overflow which leaves the tcp_space value to be
humongous.
This has no security implications but it results in KIST scheduler allowing to
send cells on a potentially saturated connection.
Found by #24423 . Fixes #24590 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-12-11 15:45:19 -05:00
Nick Mathewson
3809036c63
Reset all main.c state at exit
...
This change is part of 24587.
2017-12-11 14:05:34 -05:00
Nick Mathewson
6033538ac3
In control.c, reset the bootstrapping status on shutdown
...
Part of #24587
2017-12-11 14:05:09 -05:00
Nick Mathewson
f205dabf7a
Stop using event_base_once().
...
This function leaks memory when the event_base is freed before the
event itself fires. That's not harmful, but it's annoying when
trying to debug other memory leaks.
Fixes bug 24584; bugfix on 0.2.8.1-alpha.
2017-12-11 12:23:02 -05:00
Nick Mathewson
3b465ebf2e
Changes file and tor_api.h tweaks for 24581.
2017-12-11 11:55:41 -05:00
Nick Mathewson
06ffafcb9d
Set DH parameters to NULL on shutdown
...
If we don't do this, we will use freed memory on restart.
Part of 24581.
2017-12-11 11:52:19 -05:00
Nick Mathewson
474ca13d6a
Mark libevent unitialized on shutdown.
...
This is necessary so that we will reinitialize it on startup.
2017-12-11 11:52:19 -05:00
Nick Mathewson
322abc030e
On exit, free the event_base and set its pointer to NULL.
...
When we didn't do this before, we'd have some still-reachable memory
warnings, and we'd find ourselves crashing when we tried to
reinitialize libevent.
Part of 24581 (don't crash when restarting Tor in-process)
2017-12-11 11:52:19 -05:00
Nick Mathewson
e18840f619
Fix the log-severities memory-leak in tor-resolve.c
...
Also, rename the variable to have a more manageable name, and make
its scope more clear.
Fixes bug 24582; bugfix on 0.2.1.1-alpha.
2017-12-11 11:49:57 -05:00
