Nick Mathewson
1df4221eed
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-13 16:57:42 -04:00
Nick Mathewson
a255ca9b12
Merge branch 'maint-0.4.2' into maint-0.4.3
...
"ours" to avoid version bump.
2020-03-13 16:57:27 -04:00
Nick Mathewson
2f4fa423c3
Merge branch 'maint-0.4.1' into maint-0.4.2
...
"ours" to avoid version bump.
2020-03-13 16:57:03 -04:00
Nick Mathewson
7a9e2a261b
Merge branch 'maint-0.3.5' into maint-0.4.1
...
"ours" to avoid version bump.
2020-03-13 16:56:44 -04:00
Nick Mathewson
d17108a187
Bump to 0.3.5.10
2020-03-13 16:56:31 -04:00
Nick Mathewson
7f0ad3343e
Bump to 0.4.1.9
2020-03-13 16:56:22 -04:00
Nick Mathewson
2c1a49c464
Bump to 0.4.2.7.
2020-03-13 16:56:06 -04:00
Nick Mathewson
51a2802a03
Fold a few more entries into the 0.4.3.3-alpha changelog
2020-03-13 16:54:00 -04:00
Nick Mathewson
938487d4b4
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-13 16:46:16 -04:00
Nick Mathewson
b2e543bfe7
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-03-13 16:46:16 -04:00
Nick Mathewson
6ed2c9e5fa
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-13 16:46:16 -04:00
Nick Mathewson
1b22b6e485
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-13 16:46:16 -04:00
Nick Mathewson
b9d71f3848
Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5
2020-03-13 16:46:09 -04:00
Nick Mathewson
cecfa09442
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-13 16:45:26 -04:00
Nick Mathewson
f686631918
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-13 16:45:17 -04:00
Nick Mathewson
b504942331
Merge remote-tracking branch 'tor-github/pr/1718/head' into maint-0.4.2
2020-03-13 16:42:47 -04:00
teor
110b7a6762
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-13 13:01:27 +10:00
teor
dbadfe75e6
Merge remote-tracking branch 'tor-github/pr/1735' into maint-0.4.3
2020-03-13 13:00:58 +10:00
teor
cc2fb91ea5
connection: Stop forcing some ports to prefer IPv6
...
Stop forcing all non-SOCKSPorts to prefer IPv6 exit connections.
Instead, prefer IPv6 connections by default, but allow users to change
their configs using the "NoPreferIPv6" port flag.
Fixes bug 33608; bugfix on 0.4.3.1-alpha.
2020-03-13 12:28:19 +10:00
Nick Mathewson
13210e93f4
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-12 13:45:06 -04:00
Nick Mathewson
3e42004e54
Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3
2020-03-12 13:42:42 -04:00
Nick Mathewson
8dc7ad1275
Fix unit tests that look at contactinfo logs.
2020-03-12 13:42:17 -04:00
Nick Mathewson
619cb682f4
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-12 12:46:12 -04:00
Nick Mathewson
e03bb35f90
Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3
...
Conflicts:
src/app/config/config.c
2020-03-12 12:45:56 -04:00
David Goulet
b755a489bd
config: Warn if ContactInfo is not set
...
Closes #33361
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-03-12 12:43:00 -04:00
Nick Mathewson
eed196f122
Merge branch 'bug33032_042' into bug33032_043
2020-03-11 10:35:47 -04:00
Nick Mathewson
554b805093
Merge branch 'bug33032_041' into bug33032_042
2020-03-11 10:35:47 -04:00
Nick Mathewson
55055396cc
Merge branch 'maint-0.4.1' into bug33032_041
2020-03-11 10:35:46 -04:00
Nick Mathewson
5721ec22d8
pem_decode(): Tolerate CRLF line endings
...
Fixes bug 33032; bugfix on 0.3.5.1-alpha when we introduced our own
PEM decoder.
2020-03-11 10:35:17 -04:00
David Goulet
894ff2dc84
dos: Pass transport name on new client connection
...
For a bridge configured with a pluggable transport, the transport name is
used, with the IP address, for the GeoIP client cache entry.
However, the DoS subsystem was not aware of it and always passing NULL when
doing a lookup into the GeoIP cache.
This resulted in bridges with a PT are never able to apply DoS defenses for
newly created connections.
Fixes #33491
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-03-10 14:45:13 -04:00
Nick Mathewson
ad024c86c4
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-10 10:29:27 -04:00
Nick Mathewson
f0646919af
Bump to 0.4.3.3-alpha.
2020-03-10 10:28:09 -04:00
Nick Mathewson
ec36d1c956
More detailed description of 28992 fix.
2020-03-10 10:26:11 -04:00
Nick Mathewson
f9d306513f
Minor changelog edits.
2020-03-10 10:23:54 -04:00
Nick Mathewson
ce33e5d2b0
Start a changelog for 0.4.3.3-alpha
2020-03-10 10:21:08 -04:00
rl1987
72550c18c8
Tweak double-underscore
2020-03-10 09:13:29 -04:00
rl1987
f89c32ccd0
Document poll_interval_tv in procmon.c
2020-03-10 09:13:22 -04:00
rl1987
94a2376e01
Document __OwningControllerProcess torrc option and mention polling interval
2020-03-10 09:13:19 -04:00
Nick Mathewson
87e0873056
changes file for ticket 33460.
2020-02-26 14:19:53 -05:00
Nick Mathewson
2c792d1e0e
In typed_var_kvassign, include config names in error messages.
...
This should improve the usability of our configuration error messages.
2020-02-26 14:18:40 -05:00
Nick Mathewson
7e7aff9b6a
confmgt: when a units value is invalid, include a meaningful error.
...
Part of 33460.
2020-02-26 13:03:10 -05:00
Nick Mathewson
b133325a3e
confmgt: when an int/enum value is invalid, say which values are ok.
...
Part of 33460.
2020-02-26 13:02:28 -05:00
Nick Mathewson
7b42502869
Merge remote-tracking branch 'tor-github/pr/1757/head' into maint-0.4.3
2020-02-20 10:44:36 -05:00
Nick Mathewson
f733b8acd6
Merge remote-tracking branch 'tor-github/pr/1719/head' into maint-0.4.3
2020-02-20 08:48:17 -05:00
teor
57ff8d4a53
practracker: Read unicode files when using Python 2
...
Allow the "practracker" coding best practices checking script to read
unicode files, when using Python 2.
We made the script use unicode literals in 0.4.3.1-alpha, but didn't
change the codec for opening files.
Fixes bug 33374; bugfix on 0.4.3.1-alpha.
2020-02-19 08:22:01 +10:00
Nick Mathewson
a79841fd83
Merge branch 'ticket33290_v2_042' into maint-0.4.3
2020-02-14 08:16:22 -05:00
Nick Mathewson
393bbd823e
Merge branch 'ticket33290_v2_041' into ticket33290_v2_042
2020-02-14 08:16:01 -05:00
Nick Mathewson
c1649ab015
Wipe the entire hashent structure, not just the first sizeof(void*)
2020-02-14 08:15:37 -05:00
Nick Mathewson
6c5307e42f
Merge branch 'ticket33290_v2_043' into maint-0.4.3
2020-02-13 10:47:32 -05:00
Nick Mathewson
baeff46d36
Merge branch 'ticket33290_v2_042' into ticket33290_v2_043
...
Conflicts:
src/core/or/circuitmux_ewma.c
2020-02-13 09:21:47 -05:00
