Nick Mathewson
84d587bed8
Merge remote-tracking branch 'teor/minor-comments'
2017-09-19 08:24:49 -04:00
teor
e77ece3b31
Avoid a compilation warning on macOS in scheduler_ev_add()
...
This warning is caused by a different tv_usec data type on macOS
compared to the system on which the patch was developed.
Fixes 23575 on 0.3.2.1-alpha.
2017-09-19 16:32:47 +10:00
teor
429d88ad6a
Improve comments around connection_or_client_used()
2017-09-19 14:30:27 +10:00
teor
228d782229
Improve comments formatting in connection.c
2017-09-19 14:30:09 +10:00
Nick Mathewson
6afc924d7e
Correct what-is-deprecated-when comments
2017-09-18 15:11:33 -04:00
Nick Mathewson
2b5bc5613c
Merge remote-tracking branch 'ewongbb/chkdblcolon'
2017-09-18 15:04:14 -04:00
Nick Mathewson
94a88eaa45
Merge remote-tracking branch 'public/ticket19704'
2017-09-18 15:02:16 -04:00
Nick Mathewson
3c9ff0af96
small tweaks to releasingtor.md
2017-09-18 14:49:06 -04:00
Nick Mathewson
8d300c48e7
Merge branch 'maint-0.3.1'
...
"ours" to avoid version bump.
2017-09-18 14:40:50 -04:00
Nick Mathewson
586c327e07
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" to avoid version bump.
2017-09-18 14:40:43 -04:00
Nick Mathewson
23c5259a38
Merge branch 'maint-0.2.9' into maint-0.3.0
...
"ours" to avoid version bump.
2017-09-18 14:40:36 -04:00
Nick Mathewson
42e12a3537
Merge branch 'maint-0.2.8' into maint-0.2.9
...
"ours" to avoid version bump.
2017-09-18 14:40:22 -04:00
Nick Mathewson
32858610c7
bump to 0.3.2.1.-alpha-dev
2017-09-18 14:40:13 -04:00
Nick Mathewson
0e85b71066
bump to 0.3.1.7-dev
2017-09-18 14:40:04 -04:00
Nick Mathewson
e78347fcc2
bump to 0.3.0.11-dev
2017-09-18 14:39:55 -04:00
Nick Mathewson
a57f1ff7ab
bump to 0.2.9.12-dev
2017-09-18 14:39:46 -04:00
Nick Mathewson
0a72d1c8f1
bump to 0.2.8.15-dev
2017-09-18 14:39:40 -04:00
Nick Mathewson
290274dbb5
Add a cast so that 32-bit compilation goes without errors
2017-09-18 12:44:26 -04:00
Nick Mathewson
eba4743487
changelog tweaks from asn
2017-09-18 12:42:51 -04:00
Nick Mathewson
9342ee5eb2
Try to clarify that KIST helps relays.
2017-09-18 12:25:13 -04:00
Nick Mathewson
fc4884bf79
revision pass on the rest of the changelog
2017-09-18 11:52:27 -04:00
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
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
