Tor

tor:release-0.3.4

Last commit made on 2019-05-17
Get this branch:
git clone -b release-0.3.4 https://git.launchpad.net/tor

Branch merges

Branch information

Name:
release-0.3.4
Repository:
lp:tor

Recent commits

e2dde34... by Nick Mathewson <email address hidden>

Merge branch 'maint-0.3.4' into release-0.3.4

a521c42... by Nick Mathewson <email address hidden>

Merge branch 'maint-0.2.9' into maint-0.3.4

4e26219... by Karsten Loesing <email address hidden>

Update geoip and geoip6 to the May 13 2019 database.

fa6296d... by teor <email address hidden>

Merge branch 'maint-0.3.4' into release-0.3.4

cbce8de... by teor <email address hidden>

Merge branch 'maint-0.2.9' into maint-0.3.4

"ours" merge, to avoid taking any changes from PR 792 in 0.3.4.
(We already merged PR 791 for 29665 into 0.3.4.)

116970d... by teor <email address hidden>

Merge remote-tracking branch 'tor-github/pr/946' into maint-0.3.4

b1762f8... by teor <email address hidden>

Merge remote-tracking branch 'tor-github/pr/638' into maint-0.3.4

8154b33... by teor <email address hidden>

Merge remote-tracking branch 'tor-github/pr/791' into maint-0.3.4

2460b44... by teor <email address hidden>

Merge remote-tracking branch 'tor-github/pr/792' into maint-0.2.9

4d504bf... by teor <email address hidden>

Merge branch 'maint-0.2.9' into maint-0.3.4

"ours" merge, to avoid taking any changes from PR 772 in 0.3.4.
(We already merged a different fix for 23790 into 0.3.2 and later.)