99bc2ac5aa
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-25 21:52:16 -04:00
d8264ab62b
bump to 0.4.1.4-rc-dev
2019-07-25 21:51:53 -04:00
716c48c250
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-25 20:11:47 -04:00
278e65887b
Fix more 32-bit errors with domain and tt_int_op
2019-07-25 20:11:33 -04:00
5b31efe174
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-25 16:57:32 -04:00
6095bbf74e
test: Use a 64-bit comparison for logging domains.
2019-07-25 16:57:06 -04:00
6c4a6d1700
More edits, and pick a release date
...
(thanks to seborn)
2019-07-25 11:30:41 -04:00
15f49acb7f
Changelog edits
2019-07-25 11:06:00 -04:00
f05624030a
more entries for 0.4.1.4-rc changelog
2019-07-25 11:02:29 -04:00
53ece8bd23
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-25 10:27:41 -04:00
af26cd6101
Always check the retval of circpad_machine_current_state().
2019-07-25 10:24:23 -04:00
bd1ac408d8
Remove dead code from circpad_machine_remove_token().
2019-07-25 10:24:19 -04:00
530347972d
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-25 09:03:01 -04:00
2a4b156978
Merge branch 'tor-github/pr/1171' into maint-0.4.1
2019-07-25 09:02:53 -04:00
d62af7ae3f
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-25 09:01:38 -04:00
b2a6b52825
Bump version to 0.4.1.4-rc
2019-07-25 09:00:53 -04:00
08b3436ae8
Start on 0.4.1.4-rc changelog
2019-07-25 09:00:08 -04:00
167d873bde
Fix clang-detected errors related to log_domain_mask_t
2019-07-24 09:08:48 -04:00
b0a06e7b18
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-24 12:32:06 +03:00
bb33a2f290
Merge branch 'tor-github/pr/1181' into maint-0.4.1
2019-07-24 12:31:56 +03:00
6340873047
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-23 09:39:51 -04:00
c541258fac
Merge branch 'tor-github/pr/1158' into maint-0.4.1
2019-07-23 09:39:43 -04:00
5fb070a14d
Extract the log_domain_t type to a lower-level header
...
This way, both err and log may depend on it.
2019-07-19 10:17:22 -04:00
f682de609b
Adjust tor_log.rs for 64-bit log domains.
2019-07-19 10:07:32 -04:00
a9379d6750
Set 'routerlist' global to NULL before freeing it.
...
There is other code that uses this value, and some of it is
apparently reachable from inside router_dir_info_changed(), which
routerlist_free() apparently calls. (ouch!) This is a minimal fix
to try to resolve the issue without causing other problems.
Fixes bug 31003. I'm calling this a bugfix on 0.1.2.2-alpha, where
the call to router_dir_info_changed() was added to routerlist_free().
2019-07-19 09:49:52 -04:00
2e55fa9587
Adjust log callback type to use log_domain_mask_t
2019-07-08 14:11:02 -04:00
4512578e49
Add a compile-time assertion to prevent a recurrence of 31080.
2019-07-08 13:41:35 -04:00
09c692e72b
Use a 64-bit mask for log domains, and fix a conflict
...
When we added LD_MESG, we created a conflict with the LD_NO_MOCK
flag. We now need 64 bits for log domains in order to fix this
issue.
Fixes bug 31080; bugfix on 0.4.1.1-alpha.
2019-07-08 13:32:45 -04:00
d972f29d8d
Move declaration of LD_NO_MESG to make conflict more apparent.
2019-07-08 13:00:31 -04:00
f6c58d9f00
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-01 14:25:12 -04:00
5e16601000
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-07-01 14:25:12 -04:00
1dd9527897
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-07-01 14:25:12 -04:00
2a42d6be27
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-07-01 14:25:12 -04:00
7541aaf988
Merge branch 'chutney_ci_v4_040' into chutney_ci_v4_041
2019-07-01 14:36:53 +10:00
7b05f19801
Merge branch 'chutney_ci_v4_035' into chutney_ci_v4_040
...
This merge removes an incorrect comment about the stem version
and commit script.
2019-07-01 14:36:15 +10:00
6bc8dedbed
Travis: SKIP_MAKE_CHECK="yes" when running stem
...
And add some comments about stem
Part of 29280.
2019-07-01 14:33:54 +10:00
84f2c0affb
Merge branch 'chutney_ci_v4_029' into chutney_ci_v4_035
2019-07-01 14:33:37 +10:00
75f9ae9029
Travis: remove a redundant os: linux line
...
Linux is the first item in the os matrix, so we don't need to specify
it under matrix: include: .
Part of 29280.
2019-07-01 14:25:37 +10:00
ac7ce17983
Travis: show the chutney commit and python version
...
Part of 29280.
2019-07-01 14:25:33 +10:00
b26e3e4c56
Travis: show chutney logs on chutney job failure
...
Part of 29280.
2019-07-01 14:05:26 +10:00
fb977f8cac
changes: file for 28795
...
Replace the 157 fallbacks originally introduced in Tor 0.3.5.6-rc
in December 2018 (of which ~122 were still functional), with a
list of 148 fallbacks (70 new, 78 existing, 79 removed) generated
in June 2019.
Closes ticket 28795.
Note that we created extra lists from DE and US, but they didn't add
any more fallbacks when we tried to merge them.
2019-06-28 21:38:33 +10:00
f3b2a81ce7
fallback: apply the second fallback list from 2019
...
Update the fallback directory mirrors by merging the current list with:
fallback_dirs_2019-06-28-08-58-39_AU_f0437a39ddbc8459.inc
Part of 28795, see that ticket for logs.
2019-06-28 21:16:50 +10:00
37c2808ab0
fallback: apply the first fallback list from 2019
...
Update the fallback directory mirrors by replacing the old list with:
fallback_dirs_2019-06-25-11-49-10_AU_a37adb956fbb5cd2.inc
Part of 28795, see that ticket for logs.
2019-06-28 21:05:00 +10:00
4ff0830986
Merge branch 'maint-0.4.1' into release-0.4.1
2019-06-26 10:06:02 -04:00
3ccf91027b
Merge remote-tracking branch 'tor-github/pr/1101' into maint-0.4.1
2019-06-26 10:05:51 -04:00
89ca35ff54
Merge branch 'maint-0.4.1' into release-0.4.1
2019-06-26 09:51:32 -04:00
648d5df628
Merge remote-tracking branch 'tor-github/pr/1118' into maint-0.4.1
2019-06-26 09:49:40 -04:00
8c77a9444a
Merge branch 'maint-0.4.1' into release-0.4.1
2019-06-26 10:51:50 +03:00
00acccac64
Merge branch 'tor-github/pr/1114' into maint-0.4.1
2019-06-26 10:51:12 +03:00
d13db36d84
Merge branch 'maint-0.4.1' into release-0.4.1
2019-06-25 11:57:17 -04:00
Nick Mathewson
David Goulet
George Kadianakis
teor