Nick Mathewson
1efe822acc
Revise the first two (big) changelog entries
2017-09-18 11:39:22 -04:00
Nick Mathewson
990e15689f
Combine some changelog sections.
2017-09-18 11:27:24 -04:00
Nick Mathewson
a23a168f24
Merge remote-tracking branch 'dgoulet/bug23558_032_01'
2017-09-18 11:02:37 -04:00
David Goulet
c7af923567
sched: BUG() on event_add() and log_warn next_run
...
It is highly unlikely to happen but if so, we need to know and why. The
warning with the next_run values could help.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-18 10:58:38 -04:00
David Goulet
77cc97cf0a
sched: Don't cast to int32_t the monotime_diff_msec() result
...
When the KIST schedule() is called, it computes a diff value between the last
scheduler run and the current monotonic time. If tha value is below the run
interval, the libevent even is updated else the event is run.
It turned out that casting to int32_t the returned int64_t value for the very
first scheduler run (which is set to 0) was creating an overflow on the 32 bit
value leading to adding the event with a gigantic usec value. The scheduler
was simply never running for a while.
First of all, a BUG() is added for a diff value < 0 because if the time is
really monotonic, we should never have a now time that is lower than the last
scheduler run time. And we will try to recover with a diff value to 0.
Second, the diff value is changed to int64_t so we avoid this "bootstrap
overflow" and future casting overflow problems.
Fixes #23558
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-18 10:55:54 -04:00
Nick Mathewson
aaf0fa6d11
Merge branch 'maint-0.3.1'
2017-09-18 10:48:31 -04:00
Nick Mathewson
63ae9ea316
Make hs_ntor_ref.py work with python3
2017-09-18 10:48:28 -04:00
Nick Mathewson
0bd62c1d92
Start on a changelog for 0.3.2.1-alpha: sortchanges and formatchangelog
2017-09-18 10:32:03 -04:00
Nick Mathewson
d9dccb00cc
Bump to 0.3.2.1-alpha
2017-09-18 10:30:41 -04:00
Nick Mathewson
523188afdb
Use the lintChanges script to fix style issues in changes entries
2017-09-18 10:24:03 -04:00
Nick Mathewson
365bb6356a
remove changes files for items that appeared in 0.3.17
2017-09-18 10:12:30 -04:00
Nick Mathewson
3767a7020f
forward-port changelogs and release notes for 0.2.8.15, 0.2.9.12, 0.3.0.11, 0.3.1.7
2017-09-18 10:11:15 -04:00
Nick Mathewson
c7d0096f9d
Merge branch 'maint-0.3.1'
2017-09-18 09:42:30 -04:00
Nick Mathewson
139bda4fe4
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-18 09:40:40 -04:00
Nick Mathewson
23c4592ee9
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-18 09:40:40 -04:00
Nick Mathewson
9d8d4cb3fa
Merge branch 'trove-2017-008_030' into maint-0.3.0
2017-09-18 09:40:36 -04:00
Nick Mathewson
7df7908905
Merge branch 'maint-0.2.8' into maint-0.3.0
...
This is an "ours" merge to avoid the conflict from the 0.2.8 version
of the fix for TROVE-2017-008.
2017-09-18 09:40:09 -04:00
Nick Mathewson
314652dc16
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-09-18 09:39:46 -04:00
Nick Mathewson
0ec72b0308
Merge branch 'trove-2017-008_028' into maint-0.2.8
2017-09-18 09:39:35 -04:00
Nick Mathewson
09ea89764a
Fix log-uninitialized-stack bug in rend_service_intro_established.
...
Fixes bug 23490; bugfix on 0.2.7.2-alpha.
TROVE-2017-008
CVE-2017-0380
2017-09-18 09:32:41 -04:00
Nick Mathewson
4a2cbea6ce
Fix log-uninitialized-stack bug in rend_service_intro_established.
...
Fixes bug 23490; bugfix on 0.2.7.2-alpha.
TROVE-2017-008
CVE-2017-0380
2017-09-18 09:27:07 -04:00
Edmund Wong
f0e87ff9eb
Add check for double-semi-colons at the end of a line
2017-09-18 15:33:24 +08:00
Nick Mathewson
dd8eeabfd1
Fix memory leak in tor-gencert.c
...
This was introduced in 4ff170d7b1
, and is probably
unreachable, but coverity complained about it (CID 1417761). Bug not
in any released Tor, so no changes file.
2017-09-17 20:42:28 -04:00
Nick Mathewson
faf1242bed
add frebsd ports maintainer to releasingtor list
2017-09-17 20:32:27 -04:00
Nick Mathewson
4519b7b469
kist_no_kernel_support is unused when we didn't detect it.
...
So, remove it.
2017-09-15 16:44:05 -04:00
Nick Mathewson
f4af1919ab
Replace accumulated C ;;s with ;s
...
I don't know where these came from.
2017-09-15 16:43:17 -04:00
Nick Mathewson
76c33f7ff4
Merge branch 'scan-build-032'
2017-09-15 16:40:11 -04:00
Nick Mathewson
c1deabd3b0
Run our #else/#endif annotator on our source code.
2017-09-15 16:24:44 -04:00
Nick Mathewson
7a597718bb
Split some long #if lines to make the #endif annotator happy
2017-09-15 16:24:21 -04:00
Nick Mathewson
40ce9819dd
update script to use /* */ comments
2017-09-15 16:11:48 -04:00
Nick Mathewson
5d06bbc66f
Merge branch 'annotate_ifdefs'
2017-09-15 16:07:37 -04:00
Nick Mathewson
639766dbc3
Merge branch 'maint-0.3.1'
...
Resolve conflict with 23532 code.
2017-09-15 14:40:35 -04:00
Nick Mathewson
49b5ad6b75
Merge branch 'bug23533_031' into maint-0.3.1
2017-09-15 14:39:23 -04:00
Nick Mathewson
a01e4a1a95
kist: Cast, then do operations on int32.
...
Otherwise integer overflows can happen. Remember, doing a i32xi32
multiply doesn't actually produce a 64-bit output. You need to do
i64xi32 or i64xi64.
Coverity found this as CID 1417753
2017-09-15 14:30:19 -04:00
Nick Mathewson
9201e4c74b
Merge branch 'bug23487_029'
2017-09-15 14:27:58 -04:00
Nick Mathewson
75659fd548
Use different variable names for pw_uid usages
...
Catalyst points out that using pw_uid for two different purposes
here is likely to be confusing.
2017-09-15 14:26:59 -04:00
Nick Mathewson
03e102c1bb
Make netinet/tcp include conditional too: windows lacks it.
2017-09-15 14:08:51 -04:00
Nick Mathewson
44fa866621
fix some 32-bit warnings about printf arguments
2017-09-15 14:02:08 -04:00
Nick Mathewson
a1c495b4b9
Try to improve formatting on the Schedulers option
2017-09-15 13:57:57 -04:00
Nick Mathewson
37302e64a4
Merge branch 'remove_allow_dotexit_v2'
2017-09-15 12:10:47 -04:00
Nick Mathewson
f02fd6c3af
Remove AllowDotExit.
...
It's been deprecated since 0.2.9.2-alpha. Closes ticket 23426.
2017-09-15 12:09:33 -04:00
Nick Mathewson
fea2d84ce3
wrap a wide comment
2017-09-15 12:03:08 -04:00
Nick Mathewson
0f4f40b70f
Merge remote-tracking branch 'dgoulet/ticket12541_032_02'
2017-09-15 12:00:50 -04:00
David Goulet
0650017143
doc: Man page entries for KIST
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-15 11:58:04 -04:00
Nick Mathewson
962b0b849b
Merge remote-tracking branch 'dgoulet/ticket19254_032_01'
2017-09-15 11:52:10 -04:00
Matt Traudt
ae9e6b547d
sched: add comment about how we determine if a socket should write
2017-09-15 11:40:59 -04:00
Matt Traudt
47390d1c9e
fixup! sched: add changes file (spaces)
2017-09-15 11:40:59 -04:00
Matt Traudt
63204be48f
sched: add changes file
2017-09-15 11:40:59 -04:00
Matt Traudt
501c58187d
sched: add more per-socket limit documentation; int fix
2017-09-15 11:40:59 -04:00
David Goulet
513d642a66
sched: Revert IF_BUG_ONCE() to tor_assert()
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-15 11:40:59 -04:00