David Goulet
1da0b05a5c
Merge commit 'ef991b04e26eb4db'
2020-03-05 10:52:59 -05:00
rl1987
ef991b04e2
Refrain from mentioning nicknames in manpage section for MyFamily.
...
Also, fix a typo.
2020-03-05 17:41:49 +02:00
David Goulet
a63b414822
scripts: Remove typo in git-list-tor-branches.sh
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-03-05 10:29:47 -05:00
David Goulet
a62e3e45e6
Merge branch 'tor-github/pr/1720'
2020-03-05 10:29:42 -05:00
Nick Mathewson
d9152b8a66
Update git scripts to use git-list-tor-branches.sh
2020-03-05 10:29:35 -05:00
Nick Mathewson
42660ea056
Add a script to list the maintained Tor branches in different ways
...
This will be used for 32121
2020-03-05 10:29:35 -05:00
Nick Mathewson
ba8d71d9c3
Merge remote-tracking branch 'tor-github/pr/1774/head'
2020-03-05 09:10:24 -05:00
Nick Mathewson
8e5c75e896
Merge remote-tracking branch 'tor-github/pr/1772/head'
2020-03-05 09:09:16 -05:00
Nick Mathewson
7177eeddf1
Merge branch 'maint-0.4.3'
2020-03-05 08:48:40 -05:00
Nick Mathewson
686494f0f7
Merge branch 'clang_format_prep_3'
2020-03-05 08:23:32 -05:00
Roger Dingledine
29542ccdcc
Remove surprising empty line in info-level cbt log
...
Fixes bug 33531; bugfix on 0.3.3.1-alpha.
2020-03-04 13:45:34 -05:00
George Kadianakis
edc0bf5089
Merge branch 'tor-github/pr/1763'
2020-03-03 14:35:31 +02:00
Nick Mathewson
a5bc08579f
shared_random: Improve fallback for client no-live-consensus case.
...
In this case, when we're looking for the voting interval, we should
try looking at the _latest_ consensus if we have one. When we're
looking for the start of the current voting period, we can use our
existing fallback logic without complaint, since the voting interval
code will already have given us a reasonable voting interval, and we
want to have a round starting time based on the current time.
2020-03-03 14:35:01 +02:00
Nick Mathewson
9a7b10e23f
Comment updates from review.
2020-03-03 14:35:01 +02:00
Nick Mathewson
c705c8cf1b
changes file for 33436
2020-03-03 14:35:01 +02:00
Nick Mathewson
1b66b39699
Make voting_schedule.h work correctly when dirauth-mode is disabled.
2020-03-03 14:35:01 +02:00
Nick Mathewson
9fb18756df
Stop using all dirauth-only options in shared_random_client.c
...
This is not as clean a patch as I would like: see the comment on
ASSUME_AUTHORITY_SCHEDULING. This issue here is that the unit tests
sometimes assume that we are going to be looking at the dirauth
options and behaving like a dirauth, but without setting the options
to turn is into one.
This isn't an issue for actually running Tor, as far as I can tell
with chutney.
2020-03-03 14:35:01 +02:00
Neel Chauhan
2ef2fef711
Correct spacing in dns_launch_correctness_checks()
2020-02-26 15:48:45 -08:00
Nick Mathewson
6472d9cfdf
Run "make autostyle"
2020-02-26 16:45:33 -05:00
Nick Mathewson
87e0873056
changes file for ticket 33460.
2020-02-26 14:19:53 -05:00
Nick Mathewson
2c792d1e0e
In typed_var_kvassign, include config names in error messages.
...
This should improve the usability of our configuration error messages.
2020-02-26 14:18:40 -05:00
Nick Mathewson
7e7aff9b6a
confmgt: when a units value is invalid, include a meaningful error.
...
Part of 33460.
2020-02-26 13:03:10 -05:00
Nick Mathewson
b133325a3e
confmgt: when an int/enum value is invalid, say which values are ok.
...
Part of 33460.
2020-02-26 13:02:28 -05:00
Nick Mathewson
11adf0f46f
Merge remote-tracking branch 'tor-github/pr/1750/head'
2020-02-25 12:58:23 -05:00
Nick Mathewson
7777f1df49
Dirauth-specific function to get voting interval.
2020-02-24 10:55:06 -05:00
Nick Mathewson
d865a50296
Extract most of dirauth_sched_get_next_valid_after_time()
...
Most of this function was about recreating a voting schedule on
demand if it didn't exist yet or was not up-to-date. I've made that
into its own function.
2020-02-24 10:13:07 -05:00
Nick Mathewson
4fb6d8675f
Rename voting_schedule_*() functions.
...
This is an automated commit, generated by this command:
./scripts/maint/rename_c_identifier.py \
voting_schedule_recalculate_timing dirauth_sched_recalculate_timing \
voting_schedule_get_start_of_next_interval voting_sched_get_start_of_interval_after \
voting_schedule_get_next_valid_after_time dirauth_sched_get_next_valid_after_time
2020-02-24 10:07:09 -05:00
Nick Mathewson
b7ba558f56
Move one voting schedule fn into networkstatus.c
...
The 'voting_schdule_get_start_of_next_interval' function isn't
actually dirauth-specific.
2020-02-24 10:04:01 -05:00
Nick Mathewson
e1cf10ceb7
Move voting_schedule.[ch] to src/feature/dirauth/
2020-02-24 10:00:51 -05:00
Nick Mathewson
c9bd3579f7
Tweak a couple of URLs in gettingstarted.md
2020-02-24 08:10:20 -05:00
Nick Mathewson
b6d9484fa7
Merge remote-tracking branch 'tor-github/pr/1761/head'
2020-02-24 08:06:42 -05:00
Nick Mathewson
d4d5d9d1d1
Merge branch 'ticket33316_squashed'
2020-02-24 07:49:45 -05:00
Nick Mathewson
0c18c94bb1
extend ticket33316 changes file to include more changes
2020-02-24 07:49:39 -05:00
Nick Mathewson
e067cb426a
Move process subsystem after evloop.
...
Process uses evloop, and so should be initialized after it.
2020-02-24 07:49:39 -05:00
Nick Mathewson
63b7dabdea
Merge ocirc and orconn events into or subsystem.
...
Pubsub events are not supposed to have their own subsystems; they're
supposed to be part of a parent subsystem.
2020-02-24 07:49:39 -05:00
Nick Mathewson
2e5d555c0e
Initialize all subsystems during the unit tests
...
Previously we had initialized only the library subsystems. This
made it hard to write some tests, and encouraged people to put their
subsystems at a level lower than they really belonged at. Instead,
it probably just makes sense to initialize everything before we
start the tests.
Without this fix, 33316 breaks our tests because of raising the
level of the ocirc/orconn events.
2020-02-24 07:49:39 -05:00
Nick Mathewson
67d921a696
Changes file for ticket 33316
2020-02-24 07:49:39 -05:00
Nick Mathewson
90524de0b2
Move winprocess_sys into a new low-level hardening module
...
This code was in our process module, but it doesn't belong there:
process is for launching and monitoring subprocesses, not for
hardening the current process.
This change lets us have our subsystem init order more closely match
our dependency order.
2020-02-24 07:49:39 -05:00
Nick Mathewson
caa392a73a
Merge remote-tracking branch 'tor-github/pr/1685/head'
2020-02-24 07:45:20 -05:00
George Kadianakis
93cb8072be
Final touches to #32709 based on Nick's feedback.
...
- Fix a bug and add unittest.
- Add changes file.
- Add man page entry.
2020-02-24 12:15:35 +02:00
Nick Mathewson
84f2e28204
Use PRIu64 and TOR_PRIuSZ, to fix 32-bit build error.
2020-02-20 20:49:38 -05:00
Taylor Yu
7160a7218d
changes file for ticket 33369
2020-02-20 17:13:02 -06:00
Taylor Yu
b7c7feb2e4
manpage: fix up toc attribute
2020-02-20 16:49:08 -06:00
Nick Mathewson
ce9eeefbcc
Make direclient_dump_total_dls() respect SafeLogging and pass tests.
...
Don't dump totals with anonymous purposes. Additionally, don't dump
headers that have nothing underneath them.
2020-02-20 12:26:32 -05:00
Nick Mathewson
7ba7f9c0de
Merge branch 'maint-0.4.3'
2020-02-20 10:44:43 -05:00
Nick Mathewson
7b42502869
Merge remote-tracking branch 'tor-github/pr/1757/head' into maint-0.4.3
2020-02-20 10:44:36 -05:00
Nick Mathewson
66bbdadbbe
Merge branch 'extract_routerkeys_squashed'
2020-02-20 10:41:12 -05:00
Nick Mathewson
1d068625dd
Move relay_handshake.[ch] into src/feature/relay, and make it optional
2020-02-20 10:41:06 -05:00
Nick Mathewson
e425ffc637
Disable routerkeys.c with --disable-relay-mode.
2020-02-20 10:41:06 -05:00
Nick Mathewson
626eb025b6
Merge remote-tracking branch 'tor-github/pr/1745/head'
2020-02-20 09:14:40 -05:00