583ed7c6ec
Merge remote-tracking branch 'tor-github/pr/864'
2019-04-02 11:46:42 +10:00
9014add25f
Merge branch 'maint-0.4.0'
2019-04-02 11:45:39 +10:00
9242f32883
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-02 11:45:31 +10:00
0418d4081a
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-02 11:45:22 +10:00
74775b2dfd
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-04-02 11:45:13 +10:00
7014e57f4a
Merge branch 'bug29036-29962-034' into bug29036-29962-035
...
Merge the moved coverage line from 29036 with the stem changes in
maint-0.3.5.
2019-04-01 14:11:20 +10:00
33be8d8295
Travis: merge before_cache from 29036 and 29962
...
And add some useful comments
2019-04-01 14:08:34 +10:00
124990aa01
Add changes file
2019-04-01 14:08:24 +10:00
0c6cfd9c65
Cleanup cargo registry before each Rust-enabled build
...
Also, refrain from caching target/.
See: https://levans.fr/rust_travis_cache.html
2019-04-01 14:08:12 +10:00
ac28e56ccb
Merge branch 'bug29036-029' into bug29036-29962-034
2019-04-01 14:07:58 +10:00
57e9fe2bba
Makefile: delete all the gcov-related files in reset-gcov
...
And fix a comment.
See:
https://gcc.gnu.org/onlinedocs/gcc/Gcov-Data-Files.html#Gcov-Data-Files
2019-04-01 14:06:52 +10:00
eb0bd18d6e
changes: Use the first Tor version with CI coverage for the 29036 changes file
...
Otherwise, "make check-changes" will complain when we backport the change.
2019-04-01 13:40:16 +10:00
809a3a748d
bug_occurred: a place where we assumed that "buf" was still a buffer
...
In 9c132a5f9e
2019-03-30 21:07:15 -04:00
f0e39df5ce
allow circuituse.c to get even longer.
2019-03-29 14:30:33 -04:00
9ed02ec282
Merge branch 'ticket29662_squashed' into ticket29662_squashed_merged
2019-03-29 14:28:48 -04:00
537ad0bca3
Check for NULL in tor_assertf_nonfatal()
2019-03-29 14:26:13 -04:00
9c132a5f9e
Refrain from using static buffer for assert failure message; call tor_asprintf() instead
2019-03-29 14:26:03 -04:00
bf953fe602
Add changes file
2019-03-29 14:26:03 -04:00
a959d7cb98
Use tor_assertf{_nonfatal} in code
2019-03-29 14:25:59 -04:00
f66a17444e
Silence compiler warnings
2019-03-29 14:25:59 -04:00
194b25f0c7
dircache: Refactor handle_get_next_bandwidth() to use connection_dir_buf_add()
...
Implements ticket 29897.
2019-03-29 17:26:30 +10:00
c2222ba169
Add changes file
2019-03-29 17:26:09 +10:00
6ab1929f00
Add connection_dir_buf_add() helper function
2019-03-29 17:25:43 +10:00
c66df27c90
Fix checkIncludes warning about "unusual pattern in src/ext/timeouts/"
...
Closes ticket 28806.
2019-03-28 16:35:24 -04:00
a7bc47532b
test_routerkeys.c: Always check mkdir() return value
...
After this fix, we have no more unchecked mkdir() calls.
Bug 29939; CID 144254. Bugfix on 0.2.7.2-alpha.
2019-03-28 09:31:13 -04:00
f58587a68d
Don't unconditionally deref pub and sub in lint_message_consistency
...
This can't actually result in a null pointer dereference, since
pub_excl and sub_excl are only set when the corresponding smartlists
are nonempty. But coverity isn't smart enough to figure that out,
and we shouldn't really be depending on it.
Bug 29938; CID 1444257. Bug not in any released Tor.
2019-03-28 09:19:23 -04:00
283ee0ba0a
Fix SC2086 warnings in asciidoc-helper.sh
2019-03-27 19:27:57 +02:00
00ca3d04cf
Merge branch 'tor-github/pr/859'
2019-03-27 14:30:53 +02:00
8991280f89
Merge branch 'maint-0.4.0'
2019-03-27 12:31:37 +10:00
6d188fb4cc
Merge remote-tracking branch 'tor-github/pr/835' into maint-0.4.0
2019-03-27 12:31:07 +10:00
a10d4adc25
Stop assuming that /usr/bin/python3 exists
...
For scripts that work with python2, use /usr/bin/python.
Otherwise, use /usr/bin/env python3.
Fixes bug 29913; bugfix on 0.2.5.3-alpha.
2019-03-27 11:07:55 +10:00
7b9732063c
practracker updates from messaging_v3 merge
...
(main.c is a bit better, but shutdown.c is ugly)
2019-03-26 20:14:21 -04:00
a47b61f329
Merge branch 'messaging_v3' into messaging_v3_merged
2019-03-26 20:13:49 -04:00
3767eff9bb
changes file for pubsub code
2019-03-26 20:10:56 -04:00
57999e330b
Merge branch 'maint-0.4.0'
2019-03-27 10:02:55 +10:00
ca29cb397b
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-03-27 10:02:47 +10:00
3280e9a116
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-03-27 10:02:40 +10:00
6d057c56f1
Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4
2019-03-27 10:01:45 +10:00
203e9138d1
Remove message/subsystem numbers from log messages
...
Having the numbers in those messages makes some of the unit test
unstable, by causing them to depend on the initialization order of
the naming objects.
2019-03-26 19:56:39 -04:00
beceb079e1
practracker: regen in master, for bug28925 merged to 0.4.0 and later
...
python3 scripts/maint/practracker/practracker.py --regen
2019-03-27 09:40:03 +10:00
c72526f168
Merge branch 'maint-0.4.0'
2019-03-27 09:36:55 +10:00
9ae8d663ea
Merge remote-tracking branch 'tor-github/pr/836' into maint-0.4.0
2019-03-27 09:36:26 +10:00
7502e5467b
Regenerate practracker file from scratch.
...
Closes ticket 29912.
Since this is the first time that practracker has had a stable
output order, this diff will be larger than usual.
2019-03-26 19:28:35 -04:00
300e7d8c99
Merge branch 'practracker_regen'
2019-03-26 19:27:54 -04:00
989b6325d6
Merge branch 'tor-github/pr/842'
2019-03-26 16:41:07 +02:00
e028ec6bb7
Add new exceptions.txt entries
2019-03-26 09:43:46 -04:00
f32d890531
Merge branch 'bug29805_rebased_squashed'
2019-03-26 09:39:46 -04:00
27f24484d4
prob-distr: Some more comments about the initializers.
...
Based on patches and review comments by Riastradh and Catalyst.
Co-authored-by: Taylor R Campbell <campbell+tor@mumble.net >
Co-authored-by: Taylor Yu <catalyst@torproject.org >
2019-03-26 09:39:40 -04:00
08176c2396
prob-distr: Silence some coverity warnings.
2019-03-26 09:39:37 -04:00
d11976b8bd
Merge branch 'tor-github/pr/709'
2019-03-26 15:34:54 +02:00
teor
rl1987
Nick Mathewson
George Kadianakis