Nick Mathewson
8ada4263a9
Merge branch 'maint-0.3.5' into maint-0.4.4
...
"ours" to avoid version bump.
2021-03-15 07:40:06 -04:00
Nick Mathewson
1a0b5fd569
Bump to 0.3.5.14
2021-03-15 07:39:45 -04:00
Nick Mathewson
444233c15e
Run "make autostyle" in advance of new series.
2021-03-12 11:40:48 -05:00
Nick Mathewson
b5d08ddc09
Update copyrights to 2021, using "make update-copyright"
2021-03-12 11:39:23 -05:00
Nick Mathewson
d7e827a754
Remove MMDB conversion tool.
...
It was made to convert Maxmind's "mmdb" files into the older format
that we used. But now thanks to IPFire Location, we don't have to
touch Maxmind formats any more. (See ticket #40224.)
2021-03-12 11:37:03 -05:00
Nick Mathewson
433f526af6
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-03-12 11:36:34 -05:00
Nick Mathewson
9f59b6f458
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-03-12 11:36:34 -05:00
Nick Mathewson
6cc5613404
Merge branch 'maint-0.4.5'
2021-03-12 11:36:34 -05:00
Nick Mathewson
02230575c4
Remove maxmind license; add ipfire location database license (cc by-sa 4.0)
2021-03-12 11:36:28 -05:00
Nick Mathewson
c1ce126c74
Use the right ticket number.
2021-03-12 11:31:36 -05:00
Nick Mathewson
b014866f6a
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-03-12 11:30:22 -05:00
Nick Mathewson
0b4a0c1a26
Merge branch 'maint-0.4.5'
2021-03-12 11:30:22 -05:00
Nick Mathewson
41796158e6
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-03-12 11:30:21 -05:00
Nick Mathewson
aa6c7741e8
update geoip-2021-03-12 to mention provider transition.
2021-03-12 11:29:09 -05:00
Nick Mathewson
a7b3cb06f5
Update geoip files to match ipfire location db, 2021/03/12.
2021-03-12 11:26:07 -05:00
Nick Mathewson
9131fe7eb2
Remove changes files already merged in release-0.4.5
2021-03-12 09:56:23 -05:00
Nick Mathewson
7d9403b422
Merge remote-tracking branch 'tor-gitlab/mr/336'
2021-03-10 16:47:46 -05:00
Nick Mathewson
f98dbdb069
Merge branch 'maint-0.4.5'
2021-03-10 15:28:14 -05:00
Nick Mathewson
e8d224dfb1
Merge remote-tracking branch 'tor-gitlab/mr/335' into maint-0.4.5
2021-03-10 15:27:50 -05:00
David Goulet
19e8844622
Merge branch 'maint-0.4.5'
2021-03-10 10:06:49 -05:00
David Goulet
d382f26914
Merge branch 'tor-gitlab/mr/331' into maint-0.4.5
2021-03-10 10:06:44 -05:00
David Goulet
6fce18916f
Merge branch 'tor-gitlab/mr/331'
2021-03-10 10:06:20 -05:00
David Goulet
fc080b4113
Merge branch 'maint-0.4.5'
2021-03-10 10:04:26 -05:00
David Goulet
9f9fed3fd1
vote: Add "stats" line
...
Closes #40314
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-03-10 09:51:30 -05:00
David Goulet
f93ccb8d24
hs: Remove hamrless BUG() that can happen
...
When reloading a service, we can re-register a service and thus end up again
in the metrics store initialization code path which is fine. No need to BUG()
anymore.
Fixes #40334
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-03-10 09:12:29 -05:00
Nick Mathewson
05564a8521
Start a changelog for 0.4.6.1-alpha
2021-03-09 11:58:46 -05:00
Nick Mathewson
4f138f2ed2
Remove changes files that are already merged in 0.4.5.x
2021-03-09 11:44:54 -05:00
Nick Mathewson
9409c7f2f5
Don't warn about missing guard state if controller picked first hop
...
See comments about why this needs a new flag and we can't just use
CIRCUIT_PURPOSE_CONTROLLER.
Fixes #40285 ; bugfix on 0.3.2.1-alpha.
2021-03-08 13:42:43 -05:00
Nick Mathewson
b599f489ae
Fix documentation formatting for VirtualAddrNetworkIPv6
...
Fixes bug #40256 ; bugfix on 0.2.9.4-alpha.
2021-03-08 11:17:24 -05:00
Nick Mathewson
690c7be253
Fix parsing bug in linux get_total_system_memory().
...
Use find_str_at_start_of_line(), not strstr() here: we don't want
to match "MemTotal: " if it appears in the middle of a line.
Fixes #40315 ; bugfix on 0.2.5.4-alpha.
2021-03-03 14:52:15 -05:00
Alexander Færøy
80b6054bb0
Merge remote-tracking branch 'tor-gitlab/mr/213'
2021-03-03 15:16:20 +00:00
Nick Mathewson
a1ce89a554
Add geoip-db-tool/Cargo.lock to version control, as is the custom.
2021-03-02 08:52:25 -05:00
David Goulet
2eb015372b
Merge branch 'tor-gitlab/mr/328'
2021-03-01 08:36:02 -05:00
David Goulet
49ce31b2b6
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-03-01 08:33:47 -05:00
David Goulet
997bf3f840
Merge branch 'maint-0.4.5'
2021-03-01 08:33:47 -05:00
David Goulet
eb1759633a
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-03-01 08:33:41 -05:00
Nick Mathewson
6b7a145409
git-list-tor-branches: remove 0.4.3
2021-03-01 08:28:53 -05:00
Nick Mathewson
1b36e50fdd
Correct documentation for lib_meminfo.md
2021-03-01 08:13:32 -05:00
Alexander Færøy
a497a97e4c
Change %lu to %TOR_PRIuSZ in dos.c.
...
This patch unbreaks the Windows build on master that was introduced in
99703eaca0
2021-02-26 18:16:08 +00:00
George Kadianakis
8020ae02ab
Merge remote-tracking branch 'tor-gitlab/mr/317'
2021-02-26 12:56:14 +02:00
David Goulet
f75baf5ea5
Merge branch 'maint-0.4.5'
2021-02-24 13:55:30 -05:00
David Goulet
6ea7eb58c6
Merge branch 'tor-gitlab/mr/321' into maint-0.4.5
2021-02-24 13:55:21 -05:00
Nick Mathewson
db14801b04
Add tests for parsing and selecting directory ports.
2021-02-24 13:16:07 -05:00
Nick Mathewson
6e4b10cf67
Allow extra dirport URLs to be configured for authorities.
2021-02-24 13:15:36 -05:00
Nick Mathewson
ae0aff87ce
Choose the correct dirport when contacting an authority.
...
This is part of an implementation for proposal 330.
This implementation doesn't handle authdirs' IPv6 dirports (yet).
2021-02-24 10:23:20 -05:00
Nick Mathewson
4e977cce40
Add support for knowing multiple HTTP DirPorts for an authority.
...
(These aren't yet set or used.)
2021-02-24 10:23:20 -05:00
George Kadianakis
830b0f8c62
Merge remote-tracking branch 'tor-gitlab/mr/306'
2021-02-24 12:35:55 +02:00
David Goulet
6edb648aa0
Merge branch 'maint-0.4.5'
2021-02-23 12:28:04 -05:00
David Goulet
97e51dd01b
Merge branch 'tor-gitlab/mr/326' into maint-0.4.5
2021-02-23 12:27:59 -05:00
David Goulet
ad4f87ed3f
Remove mallinfo() from codebase
...
Now deprecated in libc >= 2.33
Closes #40309
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-02-23 12:16:58 -05:00
