George Kadianakis
0b6769a99e
Merge branch 'maint-0.4.0'
2019-04-03 17:59:46 +03:00
George Kadianakis
42aae0e693
Merge branch 'tor-github/pr/867' into maint-0.4.0
2019-04-03 17:59:02 +03:00
rl1987
9e04a87220
Fix SC2064 warning
2019-04-03 17:58:05 +03:00
rl1987
700310df61
Fix SC2006 warnings
2019-04-03 17:56:52 +03:00
George Kadianakis
50341bb5ba
Merge branch 'maint-0.4.0'
2019-04-03 17:55:41 +03:00
rl1987
9e0f0a5656
Fix SC2086 warnings in test_key_expiration.sh
2019-04-03 17:52:31 +03:00
George Kadianakis
828f1829c8
Merge branch 'tor-github/pr/811' into maint-0.4.0
2019-04-03 17:50:49 +03:00
Nick Mathewson
de76862fd6
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-03 09:27:44 -04:00
Nick Mathewson
4efbb5d2c1
Merge branch 'maint-0.4.0'
2019-04-03 09:27:44 -04:00
Nick Mathewson
4aa02d3c7a
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-03 09:27:43 -04:00
Nick Mathewson
3cfcfbac46
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-04-03 09:27:42 -04:00
Nick Mathewson
ee6f54ff3f
Merge remote-tracking branch 'tor-github/pr/860'
2019-04-03 08:33:40 -04:00
Nick Mathewson
b547ece92f
Merge branch 'pr_883_squashed'
2019-04-03 08:32:21 -04:00
Elichai Turkel
0ebe290198
Removed the use of expect from CodingStandardsRust
2019-04-03 08:32:10 -04:00
Karsten Loesing
54e249e269
Update geoip and geoip6 to the April 2 2019 database.
2019-04-03 09:26:28 +02:00
teor
fdee4dd501
Merge remote-tracking branch 'tor-github/pr/863'
2019-04-03 13:12:17 +10:00
teor
965f0d8912
Merge remote-tracking branch 'tor-github/pr/875'
2019-04-02 11:47:05 +10:00
teor
583ed7c6ec
Merge remote-tracking branch 'tor-github/pr/864'
2019-04-02 11:46:42 +10:00
teor
9014add25f
Merge branch 'maint-0.4.0'
2019-04-02 11:45:39 +10:00
teor
9242f32883
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-02 11:45:31 +10:00
teor
0418d4081a
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-02 11:45:22 +10:00
teor
74775b2dfd
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-04-02 11:45:13 +10:00
teor
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
teor
33be8d8295
Travis: merge before_cache from 29036 and 29962
...
And add some useful comments
2019-04-01 14:08:34 +10:00
rl1987
124990aa01
Add changes file
2019-04-01 14:08:24 +10:00
rl1987
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
teor
ac28e56ccb
Merge branch 'bug29036-029' into bug29036-29962-034
2019-04-01 14:07:58 +10:00
teor
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
teor
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
Nick Mathewson
809a3a748d
bug_occurred: a place where we assumed that "buf" was still a buffer
...
In 9c132a5f9e
2019-03-30 21:07:15 -04:00
Nick Mathewson
f0e39df5ce
allow circuituse.c to get even longer.
2019-03-29 14:30:33 -04:00
Nick Mathewson
9ed02ec282
Merge branch 'ticket29662_squashed' into ticket29662_squashed_merged
2019-03-29 14:28:48 -04:00
rl1987
537ad0bca3
Check for NULL in tor_assertf_nonfatal()
2019-03-29 14:26:13 -04:00
rl1987
9c132a5f9e
Refrain from using static buffer for assert failure message; call tor_asprintf() instead
2019-03-29 14:26:03 -04:00
rl1987
bf953fe602
Add changes file
2019-03-29 14:26:03 -04:00
rl1987
a959d7cb98
Use tor_assertf{_nonfatal} in code
2019-03-29 14:25:59 -04:00
rl1987
f66a17444e
Silence compiler warnings
2019-03-29 14:25:59 -04:00
teor
194b25f0c7
dircache: Refactor handle_get_next_bandwidth() to use connection_dir_buf_add()
...
Implements ticket 29897.
2019-03-29 17:26:30 +10:00
rl1987
c2222ba169
Add changes file
2019-03-29 17:26:09 +10:00
rl1987
6ab1929f00
Add connection_dir_buf_add() helper function
2019-03-29 17:25:43 +10:00
Nick Mathewson
c66df27c90
Fix checkIncludes warning about "unusual pattern in src/ext/timeouts/"
...
Closes ticket 28806.
2019-03-28 16:35:24 -04:00
Nick Mathewson
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
Nick Mathewson
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
rl1987
283ee0ba0a
Fix SC2086 warnings in asciidoc-helper.sh
2019-03-27 19:27:57 +02:00
George Kadianakis
00ca3d04cf
Merge branch 'tor-github/pr/859'
2019-03-27 14:30:53 +02:00
teor
8991280f89
Merge branch 'maint-0.4.0'
2019-03-27 12:31:37 +10:00
teor
6d188fb4cc
Merge remote-tracking branch 'tor-github/pr/835' into maint-0.4.0
2019-03-27 12:31:07 +10:00
teor
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
Nick Mathewson
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
Nick Mathewson
a47b61f329
Merge branch 'messaging_v3' into messaging_v3_merged
2019-03-26 20:13:49 -04:00
