Opened 9 months ago

Closed 9 months ago

#25469 closed enhancement (implemented)

Update to March GeoIP2 database

Reported by: karsten Owned by:
Priority: Medium Milestone: Tor: 0.3.3.x-final
Component: Core Tor/Tor Version:
Severity: Normal Keywords: tor-client tor-relay 025-backport 029-backport 031-backport 032-backport
Cc: Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

My geoip-2018-03-08 branch contains the updated geoip and geoip6 files with IPv4 and IPv6 ranges and is supposed to be merged into maint-0.2.5 and all other relevant branches.

Child Tickets

Change History (5)

comment:1 Changed 9 months ago by teor

Keywords: 026-backport 027-backport 028-backport 030-backport removed
Milestone: Tor: 0.3.4.x-finalTor: 0.3.3.x-final
Status: newmerge_ready

0.2.6 through 0.2.8 and 0.3.0 are end of life: we don't backport to them any more.

FYI: 0.2.5 is end of life on 1 May 2018, and 0.3.1 is end of life on 1 July 2018: https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam/CoreTorReleases

I think we could get this in 0.3.3, because it's still in alpha.

comment:2 Changed 9 months ago by teor

Hmm, I also think your changes file needs a ticket number,

comment:3 Changed 9 months ago by nickm

Agreed on the ticket number in the changes file.

The usual policy on geoip patches is generally "merge to all active branches". So that would be 0.2.5, 0.2.9, 0.3.1, 0.3.2, 0.3.3, and master.

comment:4 Changed 9 months ago by karsten

Sounds good. I just pushed a fixup commit to the same branch that adds the ticket number to the changes file. Let me know what else I should change. I'll use whatever we discuss here as template for the next months.

comment:5 Changed 9 months ago by nickm

Resolution: implemented
Status: merge_readyclosed

Thanks, Karsten!

I made only one change: since this is not a bug, it's not correct to say "fixes bug 25469". Instead we do "closes ticket 25469."

I've made that change, squashed, and merged to 025 and forward.

Note: See TracTickets for help on using tickets.