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
8e7778ec8a
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-07 09:29:17 -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
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
40f0db75bd
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-07 08:38:30 -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
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
Nick Mathewson
ad62cf2ac9
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-10-07 08:26:04 -04:00
Nick Mathewson
a5c5c0d2f5
Merge branch 'maint-0.4.4'
2020-10-07 08:26:04 -04:00
Nick Mathewson
701a1936fa
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-07 08:26:04 -04:00
Nick Mathewson
ad7ffa5240
Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.3.5
2020-10-07 08:25:55 -04:00
Nick Mathewson
2617987c88
Merge branch 'maint-0.4.4'
2020-10-07 08:16:20 -04:00
Nick Mathewson
a44bcc309d
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-10-07 08:16:19 -04:00
Nick Mathewson
a49373844c
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-07 08:16:19 -04:00
Nick Mathewson
98e14720b5
Merge remote-tracking branch 'tor-github/pr/1661/head' into maint-0.3.5
2020-10-07 08:14:46 -04:00
Nick Mathewson
6a54a6b351
Merge branch 'maint-0.4.4'
2020-10-07 08:10:08 -04:00
Nick Mathewson
c65f4eaf06
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-10-07 08:10:08 -04:00
Nick Mathewson
9587512578
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-07 08:10:08 -04:00
Nick Mathewson
968b6c30c1
Merge remote-tracking branch 'tor-gitlab/mr/43' into maint-0.3.5
2020-10-07 08:09:59 -04:00
Nick Mathewson
eeb00bb292
Merge branch 'maint-0.4.4'
2020-10-07 08:08:02 -04:00
Nick Mathewson
8505dd5e37
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-10-07 08:08:02 -04:00
Nick Mathewson
9029444482
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-07 08:08:01 -04:00
Nick Mathewson
e0e0ef713e
Merge remote-tracking branch 'tor-gitlab/mr/137' into maint-0.3.5
2020-10-07 08:07:53 -04:00
Nick Mathewson
3950ea0e6b
Merge branch 'maint-0.4.4'
2020-10-07 08:05:40 -04:00
Nick Mathewson
30c6b42d34
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-10-07 08:05:40 -04:00
Nick Mathewson
8a561fc5bf
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-07 08:05:40 -04:00
Nick Mathewson
84a5bd48e2
Merge remote-tracking branch 'tor-gitlab/mr/103' into maint-0.3.5
2020-10-07 08:05:31 -04:00
Nick Mathewson
15e588b446
Merge branch 'maint-0.4.4'
2020-10-07 08:03:52 -04:00
Nick Mathewson
7097d1bab9
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-10-07 08:02:18 -04:00
Nick Mathewson
b5a88e8d47
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-07 08:01:37 -04:00
Nick Mathewson
ed6a328297
Merge branch 'mr_124_squashed' into maint-0.3.5
2020-10-07 08:00:59 -04:00
