Commits · 3405a311dacae2fa3391333f862fb853a84fc674 · The Tor Project / Core / Tor · GitLab

Jun 11, 2019
- Merge branch 'maint-0.4.1' · 3405a311
  Nick Mathewson authored Jun 11, 2019
  
  3405a311
- Merge branch 'maint-0.4.0' into maint-0.4.1 · ce89fe36
  Nick Mathewson authored Jun 11, 2019
  
  ce89fe36
- Merge branch 'maint-0.3.5' into maint-0.4.0 · afa2c39b
  Nick Mathewson authored Jun 11, 2019
  
  afa2c39b
- Merge branch 'maint-0.2.9' into maint-0.3.5 · b0fa1f4f
  Nick Mathewson authored Jun 11, 2019
  
  b0fa1f4f
- Update geoip and geoip6 to the June 10 2019 database. · 0ec4ebd0
  Karsten Loesing authored Jun 11, 2019
  
  0ec4ebd0
- Merge branch 'maint-0.4.1' · eb02c323
  Nick Mathewson authored Jun 11, 2019
  
  eb02c323
- Merge remote-tracking branch 'tor-github/pr/1082' into maint-0.4.1 · 29842f68
  Nick Mathewson authored Jun 11, 2019
  
  29842f68
- Merge branch 'tor-github/pr/1060' · a7986755
  George Kadianakis authored Jun 11, 2019
  
  a7986755
- Merge branch 'ticket30769_041_01' · e5ad6fb0
  George Kadianakis authored Jun 11, 2019
  
  e5ad6fb0
- trunnel: Rename sendme.trunnel to sendme_cell.trunnel · c1359b32
  David Goulet authored Jun 05, 2019
  c1359b32
- Merge branch 'ticket30687_042_01' · 646f7a9a
  George Kadianakis authored Jun 11, 2019
  
  646f7a9a
- token-bucket: Implement a single counter object · 7cf9d54e
  David Goulet authored May 29, 2019
  7cf9d54e
- Merge branch 'maint-0.4.1' · b83dba7c
  George Kadianakis authored Jun 11, 2019
  
  b83dba7c
- Merge branch 'tor-github/pr/1065' into maint-0.4.1 · eab9dc06
  George Kadianakis authored Jun 11, 2019
  
  eab9dc06
- Merge branch 'tor-github/pr/1098' · ece5133e
  George Kadianakis authored Jun 11, 2019
  
  ece5133e
- Merge branch 'maint-0.4.1' · e9f1e975
  teor authored Jun 11, 2019
  
  e9f1e975
- Merge branch 'maint-0.4.0' into maint-0.4.1 · 2779ce1f
  teor authored Jun 11, 2019
  
  2779ce1f
- Merge branch 'maint-0.3.5' into maint-0.4.0 · 4ca18fde
  teor authored Jun 11, 2019
  
  4ca18fde
- Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5 · dcb8cad4
  teor authored Jun 11, 2019
  
  dcb8cad4
- Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5 · a742a80e
  teor authored Jun 11, 2019
  
  a742a80e
- Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5 · 202ccc39
  teor authored Jun 11, 2019
  
  202ccc39
- Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5 · a58c4cc6
  teor authored Jun 11, 2019
  
  a58c4cc6
- Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5 · cb20054c
  teor authored Jun 11, 2019
  
  cb20054c
Jun 10, 2019
- Merge branch 'maint-0.4.1' · cfa943f1
  Nick Mathewson authored Jun 10, 2019
  
  cfa943f1
- Merge branch 'maint-0.4.0' into maint-0.4.1 · 5b07ff40
  Nick Mathewson authored Jun 10, 2019
  
  5b07ff40
- Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0 · c8447f95
  Nick Mathewson authored Jun 10, 2019
  
  c8447f95
- Merge branch 'maint-0.4.1' · d6b411a3
  Nick Mathewson authored Jun 10, 2019
  
  d6b411a3
- Merge branch 'maint-0.4.0' into maint-0.4.1 · 6a72cc25
  Nick Mathewson authored Jun 10, 2019
  
  6a72cc25
- Merge branch 'maint-0.4.1' · c8e09dd0
  Nick Mathewson authored Jun 10, 2019
  
  c8e09dd0
- Merge remote-tracking branch 'tor-github/pr/1097' into maint-0.4.1 · c0285320
  Nick Mathewson authored Jun 10, 2019
  
  c0285320
- Merge remote-tracking branch 'tor-github/pr/1038' · df8e2bbc
  Nick Mathewson authored Jun 10, 2019
  
  df8e2bbc
- Merge branch 'maint-0.4.1' · 1190636f
  Nick Mathewson authored Jun 10, 2019
  
  1190636f
- Merge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1 · 765e4364
  Nick Mathewson authored Jun 10, 2019
  
  765e4364
- Add an environment variable to set GIT_PATH in git scripts · 0635170c
  Nick Mathewson authored Jun 10, 2019
  
  0635170c
- push-all: Use TOR_UPSTREAM_REMOTE_NAME to override UPSTREAM_BRANCH · bbddda3a
  Nick Mathewson authored Jun 10, 2019
  bbddda3a
- Update git scripts for new versions · 46da5304
  Nick Mathewson authored Jun 10, 2019
  46da5304
- Bump master to 0.4.2.0-alpha-dev · adc7b50e
  Nick Mathewson authored Jun 10, 2019
  
  adc7b50e
- test: fix a typo in test_rebind.sh · b9041e8a
  teor authored Jun 10, 2019
  b9041e8a
- Merge branch 'bug30713_035' into bug30713_040 · 430dd2da
  teor authored Jun 10, 2019
  
  430dd2da
- Travis: Skip test_rebind on macOS builds · be0a4be2
  teor authored Jun 10, 2019
  be0a4be2