a9d66d37d3
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-16 20:54:38 +10:00
93d12baf89
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-16 20:54:34 +10:00
9ef8f5d1b8
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-16 20:54:27 +10:00
c22696e360
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-03-16 20:54:20 +10:00
1c688ba925
Travis: Produce detailed chutney diagnostics
...
When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool
to produce detailed diagnostic output.
Closes ticket 32792.
2020-03-16 16:04:51 +10:00
1df4221eed
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-13 16:57:42 -04:00
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
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
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
d17108a187
Bump to 0.3.5.10
2020-03-13 16:56:31 -04:00
7f0ad3343e
Bump to 0.4.1.9
2020-03-13 16:56:22 -04:00
2c1a49c464
Bump to 0.4.2.7.
2020-03-13 16:56:06 -04:00
51a2802a03
Fold a few more entries into the 0.4.3.3-alpha changelog
2020-03-13 16:54:00 -04:00
938487d4b4
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-13 16:46:16 -04:00
b2e543bfe7
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-03-13 16:46:16 -04:00
6ed2c9e5fa
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-13 16:46:16 -04:00
1b22b6e485
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-13 16:46:16 -04:00
b9d71f3848
Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5
2020-03-13 16:46:09 -04:00
cecfa09442
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-13 16:45:26 -04:00
f686631918
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-13 16:45:17 -04:00
b504942331
Merge remote-tracking branch 'tor-github/pr/1718/head' into maint-0.4.2
2020-03-13 16:42:47 -04:00
110b7a6762
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-13 13:01:27 +10:00
dbadfe75e6
Merge remote-tracking branch 'tor-github/pr/1735' into maint-0.4.3
2020-03-13 13:00:58 +10:00
13210e93f4
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-12 13:45:06 -04:00
3e42004e54
Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3
2020-03-12 13:42:42 -04:00
8dc7ad1275
Fix unit tests that look at contactinfo logs.
2020-03-12 13:42:17 -04:00
619cb682f4
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-12 12:46:12 -04:00
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
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
ad024c86c4
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-10 10:29:27 -04:00
f0646919af
Bump to 0.4.3.3-alpha.
2020-03-10 10:28:09 -04:00
ec36d1c956
More detailed description of 28992 fix.
2020-03-10 10:26:11 -04:00
f9d306513f
Minor changelog edits.
2020-03-10 10:23:54 -04:00
ce33e5d2b0
Start a changelog for 0.4.3.3-alpha
2020-03-10 10:21:08 -04:00
72550c18c8
Tweak double-underscore
2020-03-10 09:13:29 -04:00
f89c32ccd0
Document poll_interval_tv in procmon.c
2020-03-10 09:13:22 -04:00
94a2376e01
Document __OwningControllerProcess torrc option and mention polling interval
2020-03-10 09:13:19 -04:00
87e0873056
changes file for ticket 33460.
2020-02-26 14:19:53 -05:00
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
7e7aff9b6a
confmgt: when a units value is invalid, include a meaningful error.
...
Part of 33460.
2020-02-26 13:03:10 -05:00
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
7b42502869
Merge remote-tracking branch 'tor-github/pr/1757/head' into maint-0.4.3
2020-02-20 10:44:36 -05:00
f733b8acd6
Merge remote-tracking branch 'tor-github/pr/1719/head' into maint-0.4.3
2020-02-20 08:48:17 -05:00
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
a79841fd83
Merge branch 'ticket33290_v2_042' into maint-0.4.3
2020-02-14 08:16:22 -05:00
393bbd823e
Merge branch 'ticket33290_v2_041' into ticket33290_v2_042
2020-02-14 08:16:01 -05:00
c1649ab015
Wipe the entire hashent structure, not just the first sizeof(void*)
2020-02-14 08:15:37 -05:00
6c5307e42f
Merge branch 'ticket33290_v2_043' into maint-0.4.3
2020-02-13 10:47:32 -05:00
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
fd1686c7d8
Merge branch 'ticket33290_v2_041' into ticket33290_v2_042
2020-02-13 09:12:48 -05:00
teor
Nick Mathewson
David Goulet
rl1987