46910c060f
Merge branch 'maint-0.3.4' into maint-0.3.5
...
"ours" to avoid version bump.
2019-02-21 09:50:46 -05:00
508002a4c2
Bump to 0.3.4.11
2019-02-21 09:50:22 -05:00
7614a8b612
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-21 09:49:56 -05:00
41c2bf590b
Update to 0.3.3.12
2019-02-21 09:49:48 -05:00
aa79196ee0
Merge branch 'maint-0.4.0'
2019-02-21 09:10:34 -05:00
34183f0d71
Fix a goofy change from abcde10fce that broke test-slow linking
...
boklm tracked this down, and it doesn't make sense. It caused
This change goes back to the previous LDFLAGS line.
2019-02-21 09:10:15 -05:00
b3416476b4
Remove all uses of weak_rng.
...
I'm not removing the weak_rng code itself yet, since it is possible
that we will want to revert one of these.
2019-02-20 12:24:34 -05:00
97b9dfe305
Add a convenience macro to get a fast one-in-n calculation
2019-02-20 12:21:05 -05:00
59c3910bec
Merge branch 'tor-github/pr/695'
2019-02-20 12:15:26 -05:00
d259194c82
Merge branch 'tor-github/pr/658'
2019-02-20 12:09:52 -05:00
da179088ee
Merge branch 'tor-github/pr/687'
2019-02-20 12:09:02 -05:00
7037fe1163
Merge branch 'tor-github/pr/700'
2019-02-20 12:06:39 -05:00
b7ad8bcaad
Use setrlimit instead of ulimit -c in backtrace tests
2019-02-20 12:06:26 -05:00
8f5a3c0460
Merge branch 'tor-github/pr/675'
2019-02-20 11:45:58 -05:00
a30f17f72f
Merge branch 'tor-github/pr/696'
2019-02-20 11:29:55 -05:00
c22446e305
Merge branch 'maint-0.4.0'
2019-02-20 10:40:20 -05:00
5ec65be8bf
Merge remote-tracking branch 'nickm/ticket29530_040' into maint-0.4.0
2019-02-20 10:39:28 -05:00
4d4eda89a1
Merge branch 'maint-0.4.0'
2019-02-20 10:36:54 -05:00
ccab4347e5
Merge remote-tracking branch 'nickm/ticket29534_040' into maint-0.4.0
2019-02-20 10:35:56 -05:00
249319ec5d
fix typos from #28614
2019-02-20 10:32:47 -05:00
208f04e9b8
Add a quick test for get_thread_fast_rng()
2019-02-19 15:36:11 -05:00
b25cd5cfe1
Implement code to manage a per-thread instance of crypto_fast_rng()
...
The subsystems API makes this really simple, fortunately.
Closes ticket 29536
2019-02-19 15:36:08 -05:00
d32e407976
Downgrade some LOG_ERR messages in the address/* tests to warnings
...
Fixes bug 29530, where the LOG_ERR messages were occurring when
we had no configured network, and so we were failing the unit tests
because of the recently-merged #28668 .
Bug not in any released Tor.
2019-02-19 14:02:32 -05:00
c9ff6a7f83
Mark map_anon_nofork test as skipped in 0.4.0
...
This test fails in some environments; since the code isn't used in
0.4.0, let's disable it for now.
Band-aid solution for #29534 ; bug not in any released Tor.
2019-02-19 13:14:26 -05:00
6927e9a60c
Merge remote-tracking branch 'tor-github/pr/665'
2019-02-19 11:56:48 -05:00
0fc5fdc430
Merge remote-tracking branch 'tor-github/pr/659'
2019-02-19 11:55:53 -05:00
97e1539f7f
Merge remote-tracking branch 'tor-github/pr/706' into maint-0.4.0
2019-02-19 11:53:02 -05:00
c3fca4e4b3
Merge branch 'maint-0.4.0'
2019-02-19 11:51:24 -05:00
4df31adef7
Merge remote-tracking branch 'tor-github/pr/704' into maint-0.4.0
2019-02-19 11:51:19 -05:00
f70929347f
Merge branch 'maint-0.4.0'
2019-02-19 11:49:24 -05:00
4bc55ed5ee
Merge branch 'bug29145_029' into maint-0.4.0
2019-02-19 11:49:20 -05:00
4417ac880a
Fix a compiler warning on OpenBSD
...
malloc_options needs to be declared extern (and declaring it extern
means we need to initialize it separately)
Fixes bug 29145; bugfix on 0.2.9.3-alpha
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com >
2019-02-19 11:38:32 -05:00
17e29bda5d
Merge branch 'maint-0.4.0'
2019-02-19 11:34:25 -05:00
b5f3a3d6a7
Merge remote-tracking branch 'tor-github/pr/707' into maint-0.4.0
2019-02-19 11:34:21 -05:00
af36af1a9b
Merge remote-tracking branch 'tor-github/pr/683'
2019-02-19 11:32:33 -05:00
1239e411a7
Merge remote-tracking branch 'tor-github/pr/694'
2019-02-19 11:31:22 -05:00
0db0b4769c
Merge remote-tracking branch 'tor-github/pr/678'
2019-02-19 11:30:27 -05:00
8a5c66cbb0
Merge branch 'maint-0.4.0'
2019-02-19 11:27:21 -05:00
26873bc4ed
Merge branch 'bug28698_035' into maint-0.4.0
2019-02-19 11:27:18 -05:00
78220aae1e
Add circuit time check before logging about relaxing circuit time
...
Signed-off-by: José M. Guisado <guigom@riseup.net >
2019-02-19 11:24:51 -05:00
485803dffe
Merge branch 'maint-0.4.0'
2019-02-19 11:21:54 -05:00
5c87add923
Merge remote-tracking branch 'tor-github/pr/701' into maint-0.4.0
2019-02-19 11:21:51 -05:00
6c652eae0a
fixup! test_dir: Refactor common code out of the dir_format unit tests
2019-02-20 00:40:18 +10:00
9a158a45b1
Bump to 0.4.1.0-alpha-dev
2019-02-19 09:29:43 -05:00
51f59f213e
router: Add some missing #endif comments
2019-02-19 21:54:30 +10:00
0c0f215822
routerkeys: Log failures at info-level in make_tap_onion_key_crosscert()
2019-02-19 21:54:13 +10:00
39ab6c9f73
test_dir: Test descriptor variants
...
Including:
* relays and bridges,
* no stats, basic stats, and all stats
Part of 29017 and 29018.
2019-02-19 21:54:13 +10:00
38fc52a50e
test_dir: Refactor common code out of the dir_format unit tests
...
Also:
* delete some obsolete code that was #if 0
* improve cleanup on failure
* make the dir_format tests more consistent with each other
* construct the descriptors using smartlist chunks
This refactor is incomplete, because removing the remaining duplicate
code would be time-consuming.
Part of 29017 and 29018.
2019-02-19 21:54:13 +10:00
8e5df40018
test_dir: Test rsa + ed25519 extrainfo creation and parsing
...
Also fix a missing mock in rsa-only parsing.
2019-02-19 21:44:41 +10:00
7a2c8daded
test_dir: Split test_dir_formats into separate rsa and rsa_ed25519 tests
2019-02-19 21:44:40 +10:00
Nick Mathewson
David Goulet
rl1987
Roger Dingledine
Kris Katterjohn
José M. Guisado
teor