Commits · 43dc92441d843bd0be032dd8565e4316b8019f1e · David Goulet / Tor · GitLab

01 Jul, 2018 1 commit
- Tabify all of the .am files. · 43dc9244
  Nick Mathewson authored Jul 01, 2018
  
  43dc9244
30 Jun, 2018 9 commits
- Merge branch 'maint-0.3.4' · 028523c8
  Nick Mathewson authored Jun 30, 2018
  
  028523c8
- Merge remote-tracking branch 'catalyst-github/bug25895_034-squashed' into maint-0.3.4 · e042727c
  Nick Mathewson authored Jun 30, 2018
  
  e042727c
- Merge branch 'maint-0.3.4' · 57155d38
  Nick Mathewson authored Jun 29, 2018
  
  57155d38
- Merge branch 'maint-0.3.3' into maint-0.3.4 · 3808e301
  Nick Mathewson authored Jun 29, 2018
  
  3808e301
- Merge branch 'maint-0.3.2' into maint-0.3.3 · 72ee0b6f
  Nick Mathewson authored Jun 29, 2018
  
  72ee0b6f
- Merge branch 'maint-0.3.1' into maint-0.3.2 · 3c97b148
  Nick Mathewson authored Jun 29, 2018
  
  3c97b148
- Merge branch 'maint-0.2.9' into maint-0.3.1 · 2968c716
  Nick Mathewson authored Jun 29, 2018
  
  2968c716
- Finally remove our EOL@EOF check. · 1953a7e6
  Nick Mathewson authored Jun 18, 2018
```
This check was added by mistake long ago.  It will be nice to see
these EOLs disappear from our code over time.

(backport from master)
```
  1953a7e6
- Restor EOL@EOF in routerlist.c · 8093a63f
  Nick Mathewson authored Jun 29, 2018
  
  8093a63f
29 Jun, 2018 30 commits
- Add another winsock2 include, for timeval in procmon. · ce940c8c
  Nick Mathewson authored Jun 29, 2018
  
  ce940c8c
- add an include to fix macos, and probably bsd too · 5921b23e
  Nick Mathewson authored Jun 29, 2018
  
  5921b23e
- Merge branch 'maint-0.3.2' into maint-0.3.3 · 36c37258
  Nick Mathewson authored Jun 29, 2018
  
  36c37258
- Merge branch 'maint-0.3.1' into maint-0.3.2 · ed84dab8
  Nick Mathewson authored Jun 29, 2018
  
  ed84dab8
- Merge branch 'maint-0.2.9' into maint-0.3.1 · a3ec89a4
  Nick Mathewson authored Jun 29, 2018
  
  a3ec89a4
- Merge branch 'maint-0.3.3' into maint-0.3.4 · 75a6e7e2
  Nick Mathewson authored Jun 29, 2018
  
  75a6e7e2
- Merge branch 'maint-0.3.4' · cd3f9572
  Nick Mathewson authored Jun 29, 2018
  
  cd3f9572
- Fix a memory error in test_shared_random · 3c0a63c4
  Nick Mathewson authored Jun 29, 2018
```
Bug not in any released Tor.
```
  3c0a63c4
- Fix some memory errors in the recent coverity fixes. · d583459d
  Nick Mathewson authored Jun 29, 2018
```
Found by asan on travis :/
```
  d583459d
- Merge branch 'maint-0.3.2' into maint-0.3.3 · 92b4996b
  Nick Mathewson authored Jun 29, 2018
  
  92b4996b
- Merge branch 'maint-0.3.3' into maint-0.3.4 · d3ecb3a8
  Nick Mathewson authored Jun 29, 2018
  
  d3ecb3a8
- Merge branch 'maint-0.3.4' · 1f389dad
  Nick Mathewson authored Jun 29, 2018
  
  1f389dad
- Merge remote-tracking branch 'ahf-github/maint-0.3.2' into maint-0.3.2 · 6e9d5fc4
  Nick Mathewson authored Jun 29, 2018
  
  6e9d5fc4
- Merge branch 'maint-0.3.4' · 7a47379f
  Nick Mathewson authored Jun 29, 2018
  
  7a47379f
- Merge branch 'maint-0.2.9' into maint-0.3.1 · ea14d340
  Nick Mathewson authored Jun 29, 2018
  
  ea14d340
- Merge branch 'maint-0.3.2' into maint-0.3.3 · f82f8179
  Nick Mathewson authored Jun 29, 2018
  
  f82f8179
- Merge branch 'maint-0.3.3' into maint-0.3.4 · f6b30a97
  Nick Mathewson authored Jun 29, 2018
  
  f6b30a97
- Merge branch 'maint-0.3.1' into maint-0.3.2 · 68dfbd5e
  Nick Mathewson authored Jun 29, 2018
  
  68dfbd5e
- Merge remote-tracking branch 'ahf-github/maint-0.3.0' into maint-0.3.1 · b89a66e9
  Nick Mathewson authored Jun 29, 2018
  
  b89a66e9
- Merge remote-tracking branch 'ahf-github/maint-0.3.1' into maint-0.3.1 · 419077c2
  Nick Mathewson authored Jun 29, 2018
  
  419077c2
- Changes file for 26467 · 890bc15a
  Nick Mathewson authored Jun 29, 2018
  
  890bc15a
- Merge branch 'maint-0.3.4' · 1a5be3c5
  Nick Mathewson authored Jun 29, 2018
  
  1a5be3c5
- Merge branch 'maint-0.3.3' into maint-0.3.4 · 5ab23e03
  Nick Mathewson authored Jun 29, 2018
  
  5ab23e03
- Merge branch 'maint-0.3.2' into maint-0.3.3 · df896ed6
  Nick Mathewson authored Jun 29, 2018
  
  df896ed6
- Merge branch 'maint-0.3.1' into maint-0.3.2 · fe2588a5
  Nick Mathewson authored Jun 29, 2018
  
  fe2588a5
- Merge branch 'maint-0.2.9' into maint-0.3.1 · 1385a511
  Nick Mathewson authored Jun 29, 2018
  
  1385a511
- Merge remote-tracking branch 'ahf-github/maint-0.2.9' into maint-0.2.9 · b426e83f
  Nick Mathewson authored Jun 29, 2018
  
  b426e83f
- Add a missing include to timers, to make windows happier · 9d5b815d
  Nick Mathewson authored Jun 29, 2018
  
  9d5b815d
- Eliminate compat.h · 6ac64e16
  Nick Mathewson authored Jun 29, 2018
  
  6ac64e16
- Stop using util.h and compat.h in src/trunnel/ · 077176a3
  Nick Mathewson authored Jun 29, 2018
  
  077176a3