42aae0e693
Merge branch 'tor-github/pr/867' into maint-0.4.0
2019-04-03 17:59:02 +03:00
50341bb5ba
Merge branch 'maint-0.4.0'
2019-04-03 17:55:41 +03:00
828f1829c8
Merge branch 'tor-github/pr/811' into maint-0.4.0
2019-04-03 17:50:49 +03:00
367dd9cf02
30001: Fix a race condition in test_dir_handle_get.c
...
Previously we used time(NULL) to set the Expires: header in our HTTP
responses. This made the actual contents of that header untestable,
since the unit tests have no good way to override time(), or to see
what time() was at the exact moment of the call to time() in
dircache.c.
This gave us a race in dir_handle_get/status_vote_next_bandwidth,
where the time() call in dircache.c got one value, and the call in
the tests got another value.
I'm applying our regular solution here: using approx_time() so that
the value stays the same between the code and the test. Since
approx_time() is updated on every event callback, we shouldn't be
losing any accuracy here.
Fixes bug 30001. Bug introduced in fb4a40c32c4a7e5; not in any
released Tor.
2019-04-03 10:16:18 -04: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
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
124990aa01
Add changes file
2019-04-01 14:08:24 +10:00
ac28e56ccb
Merge branch 'bug29036-029' into bug29036-29962-034
2019-04-01 14:07:58 +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
9ed02ec282
Merge branch 'ticket29662_squashed' into ticket29662_squashed_merged
2019-03-29 14:28:48 -04:00
bf953fe602
Add changes file
2019-03-29 14:26:03 -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
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
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
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
6d057c56f1
Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4
2019-03-27 10:01:45 +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
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
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
6ecf9590ea
changes: add file for #21377
2019-03-26 17:41:21 +10:00
3d38d0ca24
Merge branch 'maint-0.4.0'
2019-03-26 16:57:04 +10:00
828033001b
Merge remote-tracking branch 'tor-github/pr/848' into maint-0.4.0
2019-03-26 16:56:45 +10:00
d482913e69
Merge remote-tracking branch 'tor-github/pr/834'
2019-03-26 12:55:48 +10:00
669ec64325
Fix CID 1444119
...
Let's use the same function exit point for BUG() codepath that we're using
for every other exit condition. That way, we're not forgetting to clean up
the memarea.
2019-03-26 12:24:45 +10:00
b76ae3898d
Merge branch 'ticket29806_035_squashed_merged' into ticket29806_040_squashed_merged
2019-03-26 11:48:52 +10:00
b71febcea8
changes file for control.c splitup
2019-03-25 15:08:36 -04:00
George Kadianakis
Nick Mathewson
Karsten Loesing
teor
rl1987
juga0