Commit Graph

31594 Commits

Author SHA1 Message Date
Nick Mathewson 361e955cf3 map_anon: define a macro if it is possible for noinherit to fail. 2019-04-04 12:56:52 -04:00
Nick Mathewson 12205c3cbe Make map_anon expose the result of a noinherit attempt
Previously we did this for tests only, but it's valuable for getting
proper fork behavior in rand_fast.
2019-04-04 12:56:52 -04:00
Nick Mathewson ab6ad3c040 Drop thread-local fast_rng on fork.
This will cause the child process to construct a new one in a nice
safe way.

Closes ticket 29668; bug not in any released Tor.
2019-04-04 12:56:52 -04:00
David Goulet db2e916afe Merge branch 'tor-github/pr/717' 2019-03-05 14:26:59 -05:00
rl1987 7f0516022b Also disallow pushing to/from upstream branch when branch names do not match 2019-03-05 14:26:09 -05:00
rl1987 0deea98d02 Improve pre-push.git-hook description 2019-03-05 14:26:09 -05:00
rl1987 f3eac74ed9 In pre-push hook script, actually check local and remote refs 2019-03-05 14:26:09 -05:00
rl1987 ae5a0f39cd Update git pre-push hook so that only upstream branches can get pushed to origin 2019-03-05 14:26:09 -05:00
Nick Mathewson f1890707cc Merge branch 'maint-0.4.0' 2019-03-05 13:00:07 -05:00
David Goulet a999cb43df protover: Add missing Padding to translate_to_rust
This commit also explicitly set the value of the PRT enum so we can match/pin
the C enum values to the Rust one in protover/ffi.rs.

Fixes #29631

Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-03-05 12:33:43 -05:00
Nick Mathewson d24acc008d Merge remote-tracking branch 'tor-github/pr/759' 2019-03-05 12:01:28 -05:00
Nick Mathewson f8e38d21c2 Merge remote-tracking branch 'tor-github/pr/753' 2019-03-05 11:57:20 -05:00
Nick Mathewson 72751f0c30 Merge remote-tracking branch 'tor-github/pr/680' 2019-03-05 11:53:31 -05:00
Alexander Færøy c9a9de120f Fix changelog for ticket 25614 to make it pass check-changes.
Yawning's commit in fda61e030e was used to
find which version this is a bugfix on.
2019-03-05 15:50:30 +01:00
David Fifield 4578c3eb21 Set TOR_PT_EXIT_ON_STDIN_CLOSE=1 for client transports too.
Closes #25614.
2019-03-05 15:24:31 +01:00
George Kadianakis c5da1f1cd5 Merge branch 'tor-github/pr/723' 2019-03-04 18:55:28 +02:00
George Kadianakis fe2552ad65 Merge branch 'tor-github/pr/739' 2019-03-04 18:52:19 +02:00
rl1987 27eec50527 manpage: fix formatting of example on quoting options with spaces 2019-03-03 11:51:08 +02:00
David Goulet 13e93bdfd5 Merge branch 'tor-github/pr/718' 2019-03-01 09:36:23 -05:00
Nick Mathewson cb0d403049 Merge remote-tracking branch 'tor-github/pr/677' 2019-03-01 08:22:43 -05:00
Nick Mathewson 64f594499a Document crypto_fast_rng_one_in_n. 2019-03-01 08:20:54 -05:00
teor 2d5c6cddc4 Merge branch 'maint-0.4.0' 2019-03-01 14:17:54 +10:00
teor 955a622391 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-03-01 14:17:31 +10:00
teor 1c248fa27d Merge branch 'maint-0.3.4' into maint-0.3.5 2019-03-01 14:16:59 +10:00
teor f56645917e Merge branch 'maint-0.3.3' into maint-0.3.4 2019-03-01 14:16:22 +10:00
teor 76b55fde81 Merge branch 'maint-0.2.9' into maint-0.3.3 2019-03-01 14:15:59 +10:00
teor 7786198eef Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9 2019-03-01 14:15:00 +10:00
teor c1ab538479 Merge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9 2019-03-01 14:14:51 +10:00
teor ecbc2e80a0 Merge remote-tracking branch 'tor-github/pr/747' into maint-0.2.9 2019-03-01 14:14:26 +10:00
David Goulet 9256b02cc8 maint: Remove 0.3.3 branch from git scripts
It is EOL today: Febuary 28th, 2019

No more releases will occur.

Closes #29616

Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-02-28 13:16:41 -05:00
Nick Mathewson d5f6137547 Merge branch 'maint-0.4.0' 2019-02-28 11:22:06 -05:00
Nick Mathewson dc19d65c3b Merge remote-tracking branch 'tor-github/pr/728' into maint-0.4.0 2019-02-28 11:20:26 -05:00
George Kadianakis cec555f44c Merge branch 'tor-github/pr/720' 2019-02-28 12:32:16 +02:00
teor 600f5f0db4 Merge branch 'maint-0.4.0' 2019-02-28 10:50:01 +10:00
teor aef6e61347 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-02-28 10:49:47 +10:00
teor de0969ef78 Merge branch 'maint-0.3.4' into maint-0.3.5 2019-02-28 10:49:33 +10:00
teor 6a61a020ee Merge branch 'maint-0.3.3' into maint-0.3.4 2019-02-28 10:49:19 +10:00
teor be71cce9f8 Merge remote-tracking branch 'tor-github/pr/731' into maint-0.3.3 2019-02-28 10:48:46 +10:00
teor 065cfc473b Merge branch 'maint-0.4.0' 2019-02-28 10:46:29 +10:00
teor 90c8956e21 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-02-28 10:46:14 +10:00
teor be29dfedd9 Merge branch 'maint-0.3.4' into maint-0.3.5 2019-02-28 10:45:59 +10:00
teor 524731503e Merge branch 'maint-0.3.3' into maint-0.3.4 2019-02-28 10:45:44 +10:00
teor 3313444ef0 Merge branch 'maint-0.2.9' into maint-0.3.3 2019-02-28 10:45:30 +10:00
Neel Chauhan c142e3d1e6 Set CIRCLAUNCH_NEED_UPTIME in rend_service_relaunch_rendezvous() on a hs_service_requires_uptime_circ() 2019-02-27 17:37:10 -05:00
Nick Mathewson 761eb4cf79 Merge branch 'maint-0.4.0' 2019-02-27 09:59:42 -05:00
Nick Mathewson 56f01e58b4 Merge remote-tracking branch 'tor-github/pr/731' into maint-0.4.0 2019-02-27 09:59:33 -05:00
teor d4b7975ce7 test/shared-random: use sr_state_free_all() rather than sr_state_free()
sr_state_free() was renamed to sr_state_free_all() between 0.2.9 and 0.3.3.

Part of 29599.
2019-02-27 15:06:53 +10:00
teor 64e082e892 Merge branch 'bug29599_029' into bug29599_033 2019-02-27 15:06:39 +10:00
teor 4d9eb4dd0e test/shared-random: Stop leaking shared random state in the unit tests
Stop leaking parts of the shared random state in the shared-random unit
tests.

Fixes bug 29599; bugfix on 0.2.9.1-alpha.
2019-02-27 15:04:40 +10:00
teor ef12ab83c0 Merge branch 'maint-0.4.0' 2019-02-27 09:38:33 +10:00