Nick Mathewson
3df37d7b6b
Merge branch 'bug26004_029_squashed'
2018-05-08 14:26:05 -04:00
Nick Mathewson
bed3e8da9c
Add a changes file for ticket 26004.
2018-05-08 14:24:29 -04:00
Nick Mathewson
a17dc0875a
Avoid unsigned integer underflow on empty input.
2018-05-08 14:24:29 -04:00
juga0
dbc80ad19b
Allow bandwidth-file lines to have node_id in the last position
...
Closes ticket 26004.
2018-05-08 14:24:29 -04:00
Nick Mathewson
5edc72a45b
Merge remote-tracking branch 'mikeperry/bug25870_rebase'
2018-05-08 14:12:29 -04:00
Nick Mathewson
2a4439adf3
Merge branch 'ticket26008'
2018-05-08 14:09:38 -04:00
Roger Dingledine
bf5eaa82da
Merge branch 'maint-0.3.3'
2018-05-08 13:49:56 -04:00
Roger Dingledine
b979415e8b
manpage fix to stop saying CacheIPv4DNS is on by default
...
Stop saying in the manual that clients cache ipv4 dns answers from exit
relays. We haven't used them since 0.2.6.3-alpha, and in ticket 24050
we stopped even caching them as of 0.3.2.6-alpha, but we forgot to say
so in the man page.
Fixes bug 26052; bugfix on 0.3.2.6-alpha.
2018-05-08 13:13:45 -04:00
Mike Perry
e716c92127
Bug 25870: Mention path restriction differences in manpage.
2018-05-08 16:35:20 +00:00
Roger Dingledine
c3ae14549d
minor cleanups on commit 17daab76
...
better punctuation and clearer wording
2018-05-08 12:21:24 -04:00
Nick Mathewson
5ad72bc1f5
Merge remote-tracking branch 'catalyst-github/bug26036'
2018-05-07 14:38:26 -04:00
Taylor Yu
9326abe16a
Restore sys/random.h inclusion for getentropy()
...
Code movement for the refactoring for ticket 24658 didn't copy the
inclusion of sys/random.h, which is needed to get a prototype for
getentropy() on macOS 10.12 Sierra. It also didn't copy the inclusion
of sys/syscall.h, which might prevent the getrandom() syscall from
being properly detected. Move these inclusions. Bug not in any
released Tor.
2018-05-07 12:56:12 -05:00
Nick Mathewson
17236a5842
Merge branch 'maint-0.3.3'
2018-05-07 13:33:19 -04:00
Nick Mathewson
46002aa691
Merge remote-tracking branch 'mikeperry/bug25733_029' into maint-0.3.3
2018-05-07 13:33:12 -04:00
Nick Mathewson
2c5841a8b8
Merge remote-tracking branch 'saper/default_nickname'
2018-05-07 13:31:03 -04:00
Nick Mathewson
a1a32b4834
Merge branch 'ticket26014'
2018-05-07 12:07:53 -04:00
Nick Mathewson
fd1d0a7d2e
Merge remote-tracking branch 'mikeperry/bug25705_v3_033'
2018-05-07 11:09:25 -04:00
Nick Mathewson
6e3e96d2ff
Fix the selection of events to cancel in test_workqueue.c
...
Our previous algorithm had a nonzero probability of picking no
events to cancel, which is of course incorrect. The new code uses
Vitter's good old reservoir sampling "algorithm R" from 1985.
Fixes bug 26008; bugfix on 0.2.6.3-alpha.
2018-05-06 21:03:26 -04:00
Nick Mathewson
d14c245a0f
Add unit test for ..get_start_of_next_voting_interval().
...
This functionality was covered only accidentally by our voting-test
code, and as such wasn't actually tested at all. The tests that
called it made its coverage nondeterministic, depending on what time
of day you ran the tests.
Closes ticket 26014.
2018-05-06 20:42:18 -04:00
Isis Lovecruft
f36656cada
build: Fix missing include for src/rust/external/crypto_rand.rs file.
...
* FIXES #26025 : https://bugs.torproject.org/26025
2018-05-04 22:23:17 +00:00
Isis Lovecruft
f1864ff4a1
rust: Update Cargo.lock file with changes from #26024 .
2018-05-04 20:41:25 +00:00
Isis Lovecruft
36dd2a467f
rust: Update submodule commit for src/ext/rust directory.
...
* FIXES part of #26024 : https://bugs.torproject.org/26024
2018-05-04 20:37:16 +00:00
Isis Lovecruft
b5bd19ea05
Update rand dependency from 0.5.0-pre.0 to 0.5.0-pre.1.
2018-05-04 19:16:42 +00:00
Nick Mathewson
6f8b961a65
I should have tested before I pushed.
2018-05-03 20:16:53 -04:00
Nick Mathewson
08e525c198
Merge remote-tracking branch 'github/ticket25995'
2018-05-03 16:52:09 -04:00
Nick Mathewson
80b9a589bb
Merge remote-tracking branch 'dgoulet/ticket25914_034_01'
2018-05-03 16:48:03 -04:00
Nick Mathewson
2f269bfaf1
Add src/rust/rand to include.am
2018-05-03 16:16:09 -04:00
Nick Mathewson
2d07aef3cc
Move some includes around to try to fix windows builds
2018-05-03 16:14:38 -04:00
Nick Mathewson
bd153e4640
Update rust dependencies to latest version.
2018-05-03 13:55:55 -04:00
Nick Mathewson
c3b7258370
Merge remote-tracking branch 'isis/bug24660_r1'
2018-05-03 13:50:18 -04:00
Nick Mathewson
94c6eb7d7f
Merge remote-tracking branch 'dgoulet/ticket25991_034_01'
2018-05-03 13:41:34 -04:00
Nick Mathewson
48d8fe533e
Merge remote-tracking branch 'dgoulet/ticket25990_034_01'
2018-05-03 13:40:10 -04:00
Nick Mathewson
4c6a407b9d
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-03 13:38:54 -04:00
Nick Mathewson
7f629f7fd9
Merge branch 'maint-0.3.3'
2018-05-03 13:38:54 -04:00
Nick Mathewson
be5b4415c2
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-03 13:38:54 -04:00
Nick Mathewson
6361a250f0
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-03 13:38:54 -04:00
Nick Mathewson
44626b37f6
Merge remote-tracking branch 'catalyst-github/bug25936-033' into maint-0.3.3
2018-05-03 13:38:51 -04:00
Nick Mathewson
726f238b72
Merge remote-tracking branch 'catalyst-github/bug25936-031' into maint-0.3.1
2018-05-03 13:38:46 -04:00
Nick Mathewson
5227754b2f
Merge remote-tracking branch 'catalyst-github/bug25936-029' into maint-0.2.9
2018-05-03 13:38:37 -04:00
Nick Mathewson
667e66bb09
Merge branch 'maint-0.3.3'
2018-05-03 13:37:37 -04:00
Nick Mathewson
1bbe75da6d
Merge remote-tracking branch 'teor/bug25998' into maint-0.3.3
2018-05-03 13:37:33 -04:00
Nick Mathewson
5e0316142f
Merge remote-tracking branch 'github/ticket25952'
2018-05-03 11:59:53 -04:00
Nick Mathewson
ed636de4cc
Merge remote-tracking branch 'github/ticket25951'
2018-05-03 11:59:31 -04:00
Nick Mathewson
be9f0e5f20
Merge remote-tracking branch 'github/ticket25949'
2018-05-03 11:57:09 -04:00
David Goulet
224c93b976
doc: Add missing HACKING/ files to EXTRA_DIST
...
Apart from adding the newly created Module.md, this commit also adds all the
missing files we have in HACKING/ to the EXTRA_DIST.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-05-03 11:39:19 -04:00
David Goulet
e12d4286bf
doc: Add Module.md explaining Tor modules
...
Initial document that contains guidelines to write a new module in Tor.
Closes #25991
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-05-03 11:39:19 -04:00
David Goulet
319505d38c
hs-v3: Remove extra white-space and clarify comment
...
From Neel's latest patch on optimizing the hs_circ_service_get_intro_circ()
digest calculation, remove an extra white-space and clarify a comment of the
legacy key digest to inform when to use it.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-05-03 09:34:50 -04:00
David Goulet
2e8eb1d5e3
Merge remote-tracking branch 'asn/bug23107'
2018-05-03 09:33:42 -04:00
Isis Lovecruft
94dcd38a14
rust: Expose crypto_rand() as an impl of rand_core::RngCore.
2018-05-02 22:12:38 +00:00
Nick Mathewson
eb00eff09d
Merge branch 'ticket25997'
2018-05-02 16:03:57 -04:00