574c207670
Merge branch 'maint-0.4.0'
2019-04-05 14:51:33 +03:00
747b74c182
Merge branch 'tor-github/pr/800' into maint-0.4.0
2019-04-05 14:51:21 +03:00
1779878f9e
Merge remote-tracking branch 'tor-github/pr/752'
2019-04-04 20:39:36 -04:00
0e7b34354a
Merge branch 'maint-0.4.0'
2019-04-04 20:27:04 -04:00
d016bbaa7d
Merge branch 'bug29959_040_squashed' into maint-0.4.0
2019-04-04 20:26:47 -04:00
8e961b2174
bwauth: Actually include the bandwidth-file-digest in authority votes
...
Fixes bug 29959; bugfix on 0.4.0.2-alpha.
2019-04-04 20:26:09 -04:00
d194f6bedf
Implement an DormantCanceledByStartup option
...
Closes ticket 29357, and comes with appropriate notions of caution.
2019-04-04 11:48:36 -04:00
0b6769a99e
Merge branch 'maint-0.4.0'
2019-04-03 17:59:46 +03:00
42aae0e693
Merge branch 'tor-github/pr/867' into maint-0.4.0
2019-04-03 17:59:02 +03:00
4efbb5d2c1
Merge branch 'maint-0.4.0'
2019-04-03 09:27:44 -04:00
de76862fd6
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-03 09:27:44 -04:00
4aa02d3c7a
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-03 09:27:43 -04:00
3cfcfbac46
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-04-03 09:27:42 -04:00
ee6f54ff3f
Merge remote-tracking branch 'tor-github/pr/860'
2019-04-03 08:33:40 -04:00
54e249e269
Update geoip and geoip6 to the April 2 2019 database.
2019-04-03 09:26:28 +02:00
fdee4dd501
Merge remote-tracking branch 'tor-github/pr/863'
2019-04-03 13:12:17 +10:00
965f0d8912
Merge remote-tracking branch 'tor-github/pr/875'
2019-04-02 11:47:05 +10:00
583ed7c6ec
Merge remote-tracking branch 'tor-github/pr/864'
2019-04-02 11:46:42 +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
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
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
6ab1929f00
Add connection_dir_buf_add() helper function
2019-03-29 17:25:43 +10: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
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
a47b61f329
Merge branch 'messaging_v3' into messaging_v3_merged
2019-03-26 20:13:49 -04: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
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
989b6325d6
Merge branch 'tor-github/pr/842'
2019-03-26 16:41:07 +02: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
2790ee3685
Merge branch 'maint-0.4.0'
2019-03-26 15:16:37 +02:00
06951cb3fc
Merge branch 'tor-github/pr/847' into maint-0.4.0
2019-03-26 15:16:21 +02:00
613c5ff357
Merge remote-tracking branch 'tor-github/pr/724'
2019-03-26 19:31:17 +10:00
0642650865
Merge branch 'maint-0.4.0'
2019-03-26 19:16:06 +10:00
4258728d56
Merge remote-tracking branch 'tor-github/pr/852' into maint-0.4.0
2019-03-26 19:15:46 +10:00
4e6ba575a6
Add header guards to ptr_helpers.h
2019-03-26 09:49:32 +02:00
da7a8d7624
dircache: fix identation and remove unneded goto
2019-03-26 17:41:17 +10:00
892b918b66
bwauth: remove declaring args, they are now in use
2019-03-26 17:41:13 +10:00
George Kadianakis
Nick Mathewson
teor
Karsten Loesing
rl1987
juga0