David Goulet
a1dec44723
Merge branch 'tor-github/pr/1697'
2020-01-30 13:48:36 -05:00
Nick Mathewson
9662a13d7e
Fix a changelog typo
2020-01-30 12:56:06 -05:00
Nick Mathewson
ee929eedbb
Merge branch 'maint-0.4.2'
...
Using "ours" strategy to avoid version bump.
2020-01-30 11:19:41 -05:00
Nick Mathewson
c5e610af05
Merge branch 'maint-0.4.1' into maint-0.4.2
...
Using "ours" strategy to avoid version bump
2020-01-30 11:19:23 -05:00
Nick Mathewson
49cffee635
bump to 0.4.2.6-dev
2020-01-30 11:19:16 -05:00
Nick Mathewson
7afb95d3e3
Bump to 0.4.1.8-dev
2020-01-30 11:18:50 -05:00
David Goulet
e4245e2a6b
hs-v2: Turn logs into protocol warning
...
All of those can be triggered remotely so change them to protocol warnings.
Fixes #32706
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-01-30 11:14:50 -05:00
Nick Mathewson
342ea31551
copy 0.4.1.8 and 0.4.2.6 entries to master ChangeLog, ReleaseNotes.
2020-01-30 10:05:42 -05:00
Nick Mathewson
af76b9dcc6
Merge branch 'bug32673_035'
2020-01-30 09:58:23 -05:00
Nick Mathewson
9ea0c0bfcd
Merge branch 'bug33093_logging_035'
2020-01-30 09:55:40 -05:00
Nick Mathewson
2a1f8ea2e7
Do not set "once" when calling tor_bug_occurred_ from BUG().
...
The "once" flag makes tor_bug_occurred_() say that future instances
of the warning will be suppressed -- but that's not something that
BUG() does. Fixes bug 33095; bugfix on 0.4.1.1-alpha.
2020-01-30 09:43:34 -05:00
Nick Mathewson
7bd671811e
Rewrite control_event_signal() to use signal_table.
...
When we added the ACTIVE and DORMANT virtual signals, we taught the
signal command to handle them, but we didn't teach SIGNAL event to
report them.
To solve this problem and prevent it from recurring, this patch
revises the implementation of control_event_signal() to use the same
signal_table that handle_control_signal() uses. This way, the two
controller commands can't become out of sync.
Fixes bug 33104; bugfix on 0.4.0.1-alpha.
2020-01-30 09:29:07 -05:00
Nick Mathewson
39c5e1b849
Merge branch 'maint-0.4.2'
...
Use "-s ours" to avoid version bump.
2020-01-29 19:44:34 -05:00
Nick Mathewson
f470b863a0
Bump version to 0.4.2.6
2020-01-29 19:44:29 -05:00
Nick Mathewson
0fb407591b
Merge branch 'maint-0.4.1' into maint-0.4.2
...
"Ours" merge to avoid version bump.
2020-01-29 19:42:43 -05:00
Nick Mathewson
ec7f99e6ef
bump to 0.4.1.8
2020-01-29 19:42:24 -05:00
teor
c1d4399c82
Merge branch 'maint-0.4.2'
2020-01-30 07:55:20 +10:00
teor
7b6be02a92
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-01-30 07:55:12 +10:00
teor
6b392c333a
Merge branch 'maint-0.4.0' into maint-0.4.1
2020-01-30 07:55:05 +10:00
teor
65825018c7
Merge branch 'maint-0.3.5' into maint-0.4.0
2020-01-30 07:54:58 +10:00
teor
9b0b2aef80
Merge remote-tracking branch 'tor-github/pr/1634' into maint-0.4.1
2020-01-30 07:54:39 +10:00
teor
41d52e9cd8
Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5
2020-01-30 07:53:53 +10:00
Nick Mathewson
2985a6018f
buf_read_from_tls: Return ERROR_MISC, not WANTWRITE, on BUG().
...
Fixes bug 32673; bugfix on 0.3.0.4-alpha. We introduced these
checks in ee5471f9aa
to help diagnose 21369, but we used "-1"
when "TOR_TLS_ERROR_MISC" would have been correct. Found by opara.
I don't think that this is actually getting triggered in the wild,
but if it were, it could cause nasty behavior: spurious
WANTREAD/WANTWRITE returns have a way of turning into CPU-eating
busy-loops.
2020-01-29 08:50:03 -05:00
Nick Mathewson
1f163fcbde
Change BUG() messages in buf_flush_to_tls() to IF_BUG_ONCE()
...
We introduced these BUG() checks in b0ddaac074
to prevent a
recurrence of bug 23690. But there's a report of the BUG() message
getting triggered and filling up the disk. Let's change it to
IF_BUG_ONCE().
Fixes bug 33093; bugfix on 0.3.2.2-alpha.
2020-01-29 08:31:22 -05:00
teor
f3ecf0b0a4
changes: file for 33091
2020-01-29 18:27:53 +10:00
teor
c8ba2c4730
mainloop: Simplify ip_address_changed()
...
Simplify ip_address_changed() by removing redundant checks
(all exits are relays, and need to rebuild their descriptor when their
IP addresses change).
Rewrite the function comment, and rename the argument, so the function
is easier to understand and use.
Closes 33091.
2020-01-29 18:23:38 +10:00
teor
d873674fb3
connection: Improve function comments
...
Improve the function comments on connection_finished_connecting(),
to describe what the function actually does.
Part of 33091.
2020-01-29 18:22:21 +10:00
Nick Mathewson
99671c0dae
Merge remote-tracking branch 'tor-github/pr/1680'
2020-01-28 08:15:21 -05:00
Nick Mathewson
27099ffe6a
Merge remote-tracking branch 'tor-github/pr/1689'
2020-01-28 07:55:34 -05:00
teor
9d771ccc86
Travis: Stop allowing stem test failures
...
Stop allowing failures on the Travis CI stem tests job. It looks like
all the stem hangs we were seeing are now fixed, but let's make sure we
see them if they happen again.
Closes ticket 33075.
2020-01-28 19:56:56 +10:00
cclauss
3208a74f90
Use print() function in both Python 2 and Python 3
2020-01-28 01:38:54 +01:00
David Goulet
aba31e2187
Merge branch 'tor-github/pr/1683'
2020-01-27 12:04:25 -05:00
Taylor Yu
f10e6b7234
changes file for ticket 33039
2020-01-24 12:20:52 -06:00
Taylor Yu
76a8a734c9
tests for ticket 33039
2020-01-24 12:20:52 -06:00
Taylor Yu
f7a2b98674
fix leak in GETCONF
...
Fix a memory leak introduced by refactoring of control reply
formatting code. Fixes bug 33039; bugfix on 0.4.3.1-alpha.
2020-01-24 12:20:47 -06:00
Nick Mathewson
cda10a2e89
Git hooks: remove support for 0.2.9 directory layout.
...
We no longer will be pushing or committing things in branches that
use src/common or src/or.
Resolves ticket 32957.
2020-01-23 10:28:09 -05:00
Nick Mathewson
7c76cedf0f
update doc/HACKING/ReleasingTor.md
2020-01-23 08:55:55 -05:00
Nick Mathewson
e34d963c44
Bump to 0.4.3.1-alpha-dev
2020-01-22 20:30:46 -05:00
David Goulet
21d0d81d82
Merge branch 'tor-github/pr/1677'
2020-01-22 14:32:30 -05:00
Alexander Færøy
35721b38e4
Lower log level of standard error messages from PT's.
...
This patch lowers the log level of error messages from PT processes from
warning to debug.
See: https://bugs.torproject.org/33005
2020-01-22 14:32:13 -05:00
Nick Mathewson
6166af5077
pick a release date
2020-01-22 13:10:54 -05:00
Nick Mathewson
d3e63ee206
Add some changelog edits from seborn
2020-01-22 13:10:09 -05:00
Nick Mathewson
5b98eee4da
draft a changelog blurb for 0.4.3.1-alpha
2020-01-22 11:56:44 -05:00
rl1987
a207fd7226
Add changes file
2020-01-22 20:26:04 +08:00
rl1987
f1c50a0e75
Run doxygen makefile target on Travis
2020-01-22 20:26:04 +08:00
teor
08efb28743
dir_connection_t: Explain dirconn_direct better
...
Direct connections can use a DirPort or ORPort.
Indirect connections must use a multi-hop Tor circuit.
Comment-only changes.
2020-01-22 09:27:40 +10:00
Nick Mathewson
e144134294
Bump to 0.4.3.1-alpha
2020-01-21 12:33:05 -05:00
Nick Mathewson
87f129977c
changelog: small edits
2020-01-21 12:32:33 -05:00
Nick Mathewson
2d8090fc66
Run format_changelog.py
2020-01-21 11:38:56 -05:00
Nick Mathewson
9aebb252a1
Initial incorporation of 0.4.3.x changelogs.
2020-01-21 11:35:59 -05:00