Commits · 5dbb607e9472ee7fb42091ae7dc0c7f2550c4425 · The Tor Project / Core / Tor

Dec 20, 2019
- Merge branch 'maint-0.4.1' into maint-0.4.2 · 5dbb607e
  teor authored 5 years ago
  
  5dbb607e
- Merge branch 'maint-0.4.0' into maint-0.4.1 · 72376378
  teor authored 5 years ago
  
  72376378
Dec 15, 2019
- Merge branch 'bug32240_32242_041' into bug32240_32242_042 · 8b5c11fb
  teor authored 5 years ago
  
  8b5c11fb
- Merge branch 'bug32240_32242_040' into bug32240_32242_041 · 84c4ede0
  teor authored 5 years ago
  
  84c4ede0
- Merge branch 'bug32240_32242_035' into bug32240_32242_040 · d96b35d6
  teor authored 5 years ago
  
  Merge: * libzstd-dev from ticket32242_035 * shellcheck from maint-0.4.0
  d96b35d6
- Merge remote-tracking branch 'tor-github/pr/1459' into bug32240_32242_035 · 0b376361
  teor authored 5 years ago
  
  0b376361
- Merge branch 'bug32240_041' into bug32240_042 · da404910
  teor authored 5 years ago
  
  Merge: * CHUTNEY_TOR_SANDBOX=0 from bug32240_041 * RUST_VERSION from maint-0.4.2
  da404910
- Merge branch 'bug32240_040' into bug32240_041 · 4a34fd5b
  teor authored 5 years ago
  
  4a34fd5b
- Merge branch 'bug32240_035' into bug32240_040 · e2f78396
  teor authored 5 years ago
  
  e2f78396
- Merge branch 'bug32240_029' into bug32240_035 · 75096de4
  teor authored 5 years ago
  
  Merge * Chutney Trusty deletion in bug32240_029 * NSS addition in maint-0.3.5
  75096de4
- changes: file for 32240 · 37b04aee
  teor authored 5 years ago
  
  37b04aee
- Travis: Run Chutney jobs in Ubuntu Bionic images · 0f07d252
  teor authored 5 years ago
  
  Closes 32240.
  0f07d252
- Travis: Turn off Tor's Sandbox in Chutney jobs · 704f3224
  teor authored 5 years ago
  
  We need to set "Sandbox 0", until we fix sandbox errors that are triggered by Ubuntu Xenial and Bionic. See 32722. Part of 32240.
  704f3224
- Merge branch 'maint-0.4.1' into maint-0.4.2 · bd11fb10
  teor authored 5 years ago
  
  bd11fb10
- Merge branch 'maint-0.4.0' into maint-0.4.1 · ffccf6fc
  teor authored 5 years ago
  
  ffccf6fc
- Merge branch 'maint-0.3.5' into maint-0.4.0 · 74811729
  teor authored 5 years ago
  
  74811729
- Merge branch 'maint-0.2.9' into maint-0.3.5 · 1cd20ff8
  teor authored 5 years ago
  
  1cd20ff8
- Merge remote-tracking branch 'tor-github/pr/1577' into maint-0.4.2 · 933b0c1b
  teor authored 5 years ago
  
  933b0c1b
- Merge remote-tracking branch 'tor-github/pr/1576' into maint-0.3.5 · 05908d57
  teor authored 5 years ago
  
  05908d57
- Merge remote-tracking branch 'tor-github/pr/1575' into maint-0.2.9 · 7dd59460
  teor authored 5 years ago
  
  7dd59460
Dec 09, 2019
- bump to 0.4.2.5-dev · b7d18f86
  Nick Mathewson authored 5 years ago
  
  b7d18f86
- Merge branch 'maint-0.4.1' into maint-0.4.2 · 17561434
  Nick Mathewson authored 5 years ago
  
  "ours" to avoid version bump.
  17561434
- bump to 0.4.1.7-dev · 7174a80e
  Nick Mathewson authored 5 years ago
  
  7174a80e
- Merge branch 'maint-0.4.0' into maint-0.4.1 · 7aaf714e
  Nick Mathewson authored 5 years ago
  
  7aaf714e
- Bump version to 0.4.0.6-dev · b9504f78
  Nick Mathewson authored 5 years ago
  
  b9504f78
- Merge branch 'maint-0.3.5' into maint-0.4.0 · 651d29c0
  Nick Mathewson authored 5 years ago
  
  "ours" to avoid version bump.
  651d29c0
- bump to 0.3.5.9-dev · 0c4f0ec9
  Nick Mathewson authored 5 years ago
  
  0c4f0ec9
Dec 06, 2019
- Merge branch 'maint-0.4.1' into maint-0.4.2 · 3248630f
  Nick Mathewson authored 5 years ago
  
  3248630f
- Merge branch 'maint-0.4.0' into maint-0.4.1 · 6513102b
  Nick Mathewson authored 5 years ago
  
  6513102b
- Merge branch 'maint-0.3.5' into maint-0.4.0 · c7ca3fc1
  Nick Mathewson authored 5 years ago
  
  c7ca3fc1
- Merge branch 'maint-0.2.9' into maint-0.3.5 · 74cae547
  Nick Mathewson authored 5 years ago
  
  74cae547
- Update geoip and geoip6 to the December 3 2019 database. · b7b467d3
  Karsten Loesing authored 5 years ago
  
  b7b467d3
- changes: file for 32629 · f86d508d
  teor authored 5 years ago
  
  f86d508d
- changes: file for 32629 · a277f289
  teor authored 5 years ago
  
  a277f289
- changes: file for 32629 · b84e7715
  teor authored 5 years ago
  
  b84e7715
Dec 05, 2019
- Bump to 0.4.2.5 · 0a33522b
  Nick Mathewson authored 5 years ago
  
  0a33522b
- Merge branch 'maint-0.4.1' into maint-0.4.2 · f8df0f5f
  Nick Mathewson authored 5 years ago
  
  "ours" to avoid version bump.
  f8df0f5f
- bump version to 0.4.1.7 · 8933c790
  Nick Mathewson authored 5 years ago
  
  8933c790
- Merge branch 'maint-0.4.0' into maint-0.4.1 · db106540
  Nick Mathewson authored 5 years ago
  
  "ours" to avoid version bump.
  db106540
- Bump to 0.4.0.6 · e66533be
  Nick Mathewson authored 5 years ago
  
  e66533be