Commits · 86456472508276b3db4e7760aa1173f93316216f · The Tor Project / Core / Tor

Jul 17, 2018
- Fix build to work with --disable-unittests again · 86456472
  rl1987 authored 6 years ago
  
  86456472
Jul 12, 2018
- Merge branch 'maint-0.3.3' into maint-0.3.4 · e0f33c1d
  Nick Mathewson authored 6 years ago
  
  e0f33c1d
- Merge branch 'maint-0.3.2' into maint-0.3.3 · 710188f8
  Nick Mathewson authored 6 years ago
  
  710188f8
- Merge branch 'maint-0.2.9' into maint-0.3.2 · 98ee23ca
  Nick Mathewson authored 6 years ago
  
  98ee23ca
- put new bridge auth Serge into place · cd4795ca
  Roger Dingledine authored 6 years ago
  
  The "Bifroest" bridge authority has been retired; the new bridge authority is "Serge", and it is operated by George from the TorBSD project. Closes ticket 26771.
  cd4795ca
Jul 09, 2018
- Merge branch 'maint-0.3.3' into maint-0.3.4 · d7ad6d92
  Nick Mathewson authored 6 years ago
  
  "ours" to avoid version bump.
  d7ad6d92
- Bump to 0.3.4.4-rc-dev · 5ce348c4
  Nick Mathewson authored 6 years ago
  
  5ce348c4
- Bump to 0.3.3.8-dev. · f5e3bcb6
  Nick Mathewson authored 6 years ago
  
  f5e3bcb6
- Merge branch 'maint-0.3.3' into maint-0.3.4 · 98dff5df
  Nick Mathewson authored 6 years ago
  
  98dff5df
- Merge branch 'maint-0.3.2' into maint-0.3.3 · 250e0fc1
  Nick Mathewson authored 6 years ago
  
  250e0fc1
- Merge remote-tracking branch 'github/bug26269_031' into maint-0.3.2 · 6ad2c2b9
  Nick Mathewson authored 6 years ago
  
  6ad2c2b9
- Merge branch 'maint-0.3.3' into maint-0.3.4 · 529faef2
  Nick Mathewson authored 6 years ago
  
  529faef2
- Merge branch 'maint-0.3.2' into maint-0.3.3 · 69918629
  Nick Mathewson authored 6 years ago
  
  69918629
- Merge branch 'maint-0.2.9' into maint-0.3.2 · 4a604d99
  Nick Mathewson authored 6 years ago
  
  4a604d99
- Merge branch 'bug26269_029' into maint-0.2.9 · 8b53dfc3
  Nick Mathewson authored 6 years ago
  
  8b53dfc3
- Merge branch 'maint-0.3.3' into maint-0.3.4 · afee7854
  Nick Mathewson authored 6 years ago
  
  "ours" merge to avoid version bump
  afee7854
- Bump to 0.3.3.8 · 532873a9
  Nick Mathewson authored 6 years ago
  
  532873a9
- Bump to 0.3.3.4-rc · 9320100d
  Nick Mathewson authored 6 years ago
  
  9320100d
- Merge branch 'maint-0.3.3' into maint-0.3.4 · b74ed31f
  Nick Mathewson authored 6 years ago
  
  "ours" merge to avoid cherry-picked copy of #25512 fix, which is already in this branch.
  b74ed31f
- Clear all control.c flags on control_free_all() · a95cfb8a
  Nick Mathewson authored 7 years ago
  
  Fixes bug 25512. (Cherry-picked from 3519d0c8
  a95cfb8a
- Merge branch 'maint-0.3.3' into maint-0.3.4 · 75d9db9e
  Nick Mathewson authored 6 years ago
  
  75d9db9e
- Merge remote-tracking branch 'catalyst-github/bug26455_033' into maint-0.3.3 · f721a082
  Nick Mathewson authored 6 years ago
  
  f721a082
- Merge branch 'maint-0.2.9' into maint-0.3.2 · d3894dc3
  Nick Mathewson authored 6 years ago
  
  d3894dc3
- Merge branch 'maint-0.3.3' into maint-0.3.4 · 1af69c18
  Nick Mathewson authored 6 years ago
  
  1af69c18
- Merge branch 'maint-0.3.2' into maint-0.3.3 · 451a84ce
  Nick Mathewson authored 6 years ago
  
  451a84ce
- Merge branch 'maint-0.3.3' into maint-0.3.4 · 9b9625bd
  Nick Mathewson authored 6 years ago
  
  9b9625bd
- Merge remote-tracking branch 'mikeperry/bug25705_v3_033' into maint-0.3.3 · fead22fb
  Nick Mathewson authored 6 years ago
  
  fead22fb
Jul 06, 2018
- Update geoip and geoip6 to the July 3 2018 database. · 9faa28b6
  Karsten Loesing authored 6 years ago
  
  9faa28b6
Jul 03, 2018
- Merge remote-tracking branch 'github/bug26568_034' into maint-0.3.4 · 32d9d693
  Nick Mathewson authored 6 years ago
  
  32d9d693
- Merge branch 'maint-0.2.9' into maint-0.3.2 · a4e8f945
  Nick Mathewson authored 6 years ago
  
  a4e8f945
- Merge branch 'maint-0.3.2' into maint-0.3.3 · 4c094436
  Nick Mathewson authored 6 years ago
  
  4c094436
- Merge branch 'maint-0.3.3' into maint-0.3.4 · d38e4749
  Nick Mathewson authored 6 years ago
  
  d38e4749
- Merge branch 'bug26535_032' into maint-0.3.2 · e6366f78
  Nick Mathewson authored 6 years ago
  
  e6366f78
- Merge branch 'bug26535_029' into maint-0.2.9 · b205714b
  Nick Mathewson authored 6 years ago
  
  b205714b
Jul 02, 2018
- Partially revert "Use tor_addr_from_getsockname() in several places" · dfdf3240
  Nick Mathewson authored 6 years ago
  
  This reverts part of commit 6ed384b8, in order to fix bug 26568. Bugfix on 0.3.4.1-alpha.
  dfdf3240
- hs_ntor_ref.py: pass only strings to subprocess.Popen · 3baf3d01
  Nick Mathewson authored 6 years ago
  
  Recent Python3 versions seem to require this on Windows. Fixes bug 26535; bug copied from ntor_ref.py on 0.3.1.1-alpha.
  3baf3d01
- ntor_ref.py: pass only strings to subprocess.Popen · fc5f8b69
  Nick Mathewson authored 6 years ago
  
  Recent Python3 versions seem to require this on Windows. Fixes bug 26535; bug introduced in f4be34f7, which was apparently intended itself as a Python3 workaround.
  fc5f8b69
- Merge remote-tracking branch 'catalyst-github/bug26449_034' into maint-0.3.4 · cd2be428
  Nick Mathewson authored 6 years ago
  
  cd2be428
- Merge branch 'mikeperry_bug26214-rebased_squashed' into maint-0.3.4 · bfcfeaed
  Nick Mathewson authored 6 years ago
  
  bfcfeaed
Jul 01, 2018
- Merge branch 'maint-0.3.3' into maint-0.3.4 · cf8c3abf
  Nick Mathewson authored 6 years ago
  
  cf8c3abf