Nick Mathewson
c90535c539
Merge branch 'maint-0.4.4'
2020-10-26 16:39:31 -04:00
Nick Mathewson
c1bcc1da03
Make ticket40164 compliant with style
2020-10-26 16:39:24 -04:00
George Kadianakis
07f2a06c61
Merge remote-tracking branch 'tor-gitlab/mr/169' into master
2020-10-26 17:04:58 +02:00
Nick Mathewson
f43fe890dd
Merge remote-tracking branch 'tor-gitlab/mr/127'
2020-10-23 11:47:40 -04:00
Nick Mathewson
2908086694
Merge branch 'combined_libs'
2020-10-23 10:33:07 -04:00
Nick Mathewson
e834702f9d
Changes file for ticket 40127
2020-10-23 10:32:08 -04:00
Roger Dingledine
00118355f5
Turn ConsensusParams into a Linelist
...
Make it possible to specify multiple ConsensusParams torrc
lines.
Now directory authority operators can for example put the
main ConsensusParams config in one torrc file and then add to it
from a different torrc file.
Closes ticket 40164.
2020-10-22 03:26:03 -04:00
David Goulet
0d420918e7
main: Off by one when dumping subsystem list
...
Fixes #40163
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-10-21 13:48:37 -04:00
Nick Mathewson
c9ddf191cf
Make "check-changes" work on bug32671.
2020-10-21 07:44:54 -04:00
Daniel Pinto
bb9707420e
Allow mutiple lines on configuration for ROUTERSET entries. #28361
...
Affected entries are: EntryNodes, ExcludeNodes, ExcludeExitNodes,
ExitNodes, MiddleNodes, HSLayer2Nodes and HSLayer3Nodes.
2020-10-21 01:53:50 +01:00
Guinness
0668437b58
Set is_padding_timer_scheduled to 0
...
When calling `circpad_send_padding_cell_for_callback()`, the flag
`is_padding_timer_scheduled` was not resetted to 0 which caused an issue
in the circpad simulator.
This commit fixes this problem.
Fixes #32671 .
2020-10-20 21:04:33 +02:00
Nick Mathewson
66cd12e044
reindent changes/ticket40053
2020-10-20 09:03:51 -04:00
Nick Mathewson
579f200efc
Merge branch 'mr_175_squashed'
2020-10-20 09:03:26 -04:00
Guinness
5248d08ede
Consider 301 as an error like 404
...
Tor does not follow redirects when bootstraping so we encountered an
error.
Fixes #40053
2020-10-20 08:57:42 -04:00
George Kadianakis
19302a1dfd
Merge remote-tracking branch 'tor-gitlab/mr/148' into master
2020-10-20 13:26:19 +03:00
Nick Mathewson
cb4cedae68
Explain why we use "mark_as_used_for_origin_circuit" where we do
...
Also, explain why it's relevant for bootstrapping.
This is a comments-only patch.
2020-10-19 11:45:24 -04:00
Nick Mathewson
f7adf3653f
Simplify logic to use smartlist_add_asprintf()
2020-10-19 11:24:32 -04:00
Nick Mathewson
151d446aa1
Merge remote-tracking branch 'tor-gitlab/mr/167'
2020-10-19 11:15:20 -04:00
David Goulet
bb249a221f
Merge branch 'tor-gitlab/mr/170'
2020-10-14 09:46:44 -04:00
Nick Mathewson
f02f8f8946
Use "flavor" spelling consistently on manpage.
2020-10-14 09:45:41 -04:00
Nick Mathewson
d66cec8520
Apply typo fix patch from Samanta Navarro on #40161 .
2020-10-14 09:43:26 -04:00
Nick Mathewson
a251cff0c3
Add changes file for 40139 (removing usecreatefast and useoptimisticdata
2020-10-13 14:42:59 -04:00
Nick Mathewson
42a5e652cb
Make OptimisticData always-on.
...
We've been using it for years, and it seems to work just fine. This
patch removes the option and its network parameter.
Part of #40139
2020-10-13 14:38:32 -04:00
Nick Mathewson
ac311a38ec
Make "usecreatefast" always-off.
...
Part of #40139 , where I'm removing network parameters that we
shouldn't be looking at any longer.
2020-10-13 14:00:34 -04:00
Alexander Færøy
78aa037c41
Merge remote-tracking branch 'tor-gitlab/mr/161'
2020-10-13 13:50:14 +00:00
Alexander Færøy
5d23881770
Merge remote-tracking branch 'tor-gitlab/mr/165'
2020-10-13 13:45:01 +00:00
Neel Chauhan
05242f5555
Pass the SOCKS request address in relay begin cells
2020-10-12 20:46:42 -07:00
Alex Xu (Hello71)
29065db381
dirclient: print bandwidth usage on one line ( #40159 )
2020-10-08 09:48:38 -04:00
Nick Mathewson
c4812698c3
Remove long-obsolete members from the state file.
...
Tor has a feature to preserve unrecognized state file entries in
order to maintain forward compatibility. But this feature, along
with some unused code that we never actually removed, led to us
keeping items that were of no use to the user, other than at worst
to preserve ancient information about them.
This commit adds a feature to remove obsolete entries when we load
the file.
Closes ticket 40137.
2020-10-07 20:46:37 +03:00
Nick Mathewson
2ceea13140
Merge remote-tracking branch 'tor-gitlab/mr/164'
2020-10-07 09:42:37 -04:00
Nick Mathewson
ef70f5f42a
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-10-07 09:29:17 -04:00
Nick Mathewson
d41025312a
Merge branch 'maint-0.4.4'
2020-10-07 09:29:17 -04:00
Nick Mathewson
8e7778ec8a
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-07 09:29:17 -04:00
Nick Mathewson
741edf1b45
Merge remote-tracking branch 'tor-github/pr/1827/head' into maint-0.3.5
2020-10-07 09:29:07 -04:00
David Goulet
17e9d40c16
Merge branch 'tor-gitlab/mr/159'
2020-10-07 09:00:10 -04:00
Nick Mathewson
9ad525604e
Use AC_LANG_SOURCE
2020-10-07 09:00:06 -04:00
Nick Mathewson
59c36b9b58
Use AC_RUN_IFELSE, not AC_TRY_RUN.
2020-10-07 09:00:06 -04:00
Nick Mathewson
de03f7a13d
Changes file for autoconf improvements in 40138
2020-10-07 09:00:06 -04:00
Nick Mathewson
ec9ac0756d
configure.ac: Summarize how many times we warned.
...
It's way too easy to have a warning in the middle of the configure
process that the user never notices.
2020-10-07 09:00:06 -04:00
Nick Mathewson
96b69152ce
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-10-07 08:38:30 -04:00
Nick Mathewson
40f0db75bd
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-07 08:38:30 -04:00
Nick Mathewson
95a5186463
Merge branch 'maint-0.4.4'
2020-10-07 08:38:30 -04:00
David Goulet
b404f085ad
hs-v2: Add deprecation warning for service
...
If at least one service is configured as a version 2, a log warning is emitted
once and only once.
Closes #40003
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-10-07 08:38:23 -04:00
Nick Mathewson
0e2e517019
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-10-07 08:35:18 -04:00
Nick Mathewson
d0eee3c575
Merge branch 'maint-0.4.4'
2020-10-07 08:35:18 -04:00
Neel Chauhan
884cad3edf
Make HSFETCH take the decoded length into account, not the base32 one
2020-10-07 08:35:12 -04:00
Nick Mathewson
faac186075
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-10-07 08:29:32 -04:00
Nick Mathewson
fe11a079d8
Merge branch 'maint-0.4.4'
2020-10-07 08:29:32 -04:00
Nick Mathewson
3e9fa5a029
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-07 08:29:31 -04:00
Nick Mathewson
5f5587ee50
Merge remote-tracking branch 'tor-gitlab/mr/77' into maint-0.3.5
2020-10-07 08:29:23 -04:00