Commits · 02fcb29d11abe9556ab4d118f2f89e557d1751dd · David Goulet / Tor · GitLab

03 Aug, 2017 6 commits
- Merge branch 'maint-0.3.1' · 02fcb29d
  Nick Mathewson authored Aug 03, 2017
  
  02fcb29d
- Merge branch 'maint-0.3.0' into maint-0.3.1 · e220e6e4
  Nick Mathewson authored Aug 03, 2017
  
  e220e6e4
- Merge branch 'maint-0.2.9' into maint-0.3.0 · f33c9661
  Nick Mathewson authored Aug 03, 2017
  
  f33c9661
- Merge branch 'maint-0.2.8' into maint-0.2.9 · 96960215
  Nick Mathewson authored Aug 03, 2017
  
  96960215
- Merge branch 'maint-0.2.5' into maint-0.2.8 · 93b28972
  Nick Mathewson authored Aug 03, 2017
  
  93b28972
- Update geoip and geoip6 to the August 3 2017 database. · 1280de42
  Karsten Loesing authored Aug 03, 2017
  
  1280de42
02 Aug, 2017 7 commits
- Merge branch 'maint-0.3.1' · c4c5077a
  Nick Mathewson authored Aug 02, 2017
  
  c4c5077a
- Merge branch 'bug23071_031' into maint-0.3.1 · a9a8d53d
  Nick Mathewson authored Aug 02, 2017
  
  a9a8d53d
- Make the hs_ntor_ref logic more correct when there is no sha3 module · ee849ee8
  Nick Mathewson authored Aug 02, 2017
  
  ee849ee8
- Merge branch 'maint-0.3.1' · 70636423
  Nick Mathewson authored Aug 02, 2017
  
  70636423
- Forward-port 0.3.0.10 changelog · ebce26b5
  Nick Mathewson authored Aug 02, 2017
  
  ebce26b5
- Merge branch 'maint-0.3.0' into maint-0.3.1 · 830b7b31
  Nick Mathewson authored Aug 02, 2017
```
"ours" merge to avoid version bump.
```
  830b7b31
- version bump to 0.3.0.10-dev · 8925e84b
  Nick Mathewson authored Aug 02, 2017
  
  8925e84b
01 Aug, 2017 27 commits
- Merge branch 'maint-0.3.1' · 256c1b73
  Nick Mathewson authored Aug 01, 2017
  
  256c1b73
- Merge branch 'maint-0.3.0' into maint-0.3.1 · 71248800
  Nick Mathewson authored Aug 01, 2017
```
"Ours merge" to avoid version bump.
```
  71248800
- Bump to 0.3.0.10 · 4f7955d5
  Nick Mathewson authored Aug 01, 2017
  
  4f7955d5
- forward-port 0.3.1.5-alpha changelog · c1edd83d
  Nick Mathewson authored Aug 01, 2017
  
  c1edd83d
- Merge branch 'maint-0.3.1' · 370a2b9f
  Nick Mathewson authored Aug 01, 2017
```
"ours" merge to avoid version bump.
```
  370a2b9f
- bump to 0.3.1.5-alpha-dev · 9c294d29
  Nick Mathewson authored Aug 01, 2017
  
  9c294d29
- Remove one more changes file for item already in release-0.3.1 · e7273495
  Nick Mathewson authored Aug 01, 2017
  
  e7273495
- Merge branch 'maint-0.2.9' into maint-0.3.0 · 4d262035
  Nick Mathewson authored Aug 01, 2017
  
  4d262035
- Merge branch 'maint-0.3.0' into maint-0.3.1 · b2d528d3
  Nick Mathewson authored Aug 01, 2017
  
  b2d528d3
- Merge branch 'maint-0.3.1' · 39ade001
  Nick Mathewson authored Aug 01, 2017
  
  39ade001
- Merge remote-tracking branch 'public/bug19769_19025_029' into maint-0.2.9 · 58e1c6dd
  Nick Mathewson authored Aug 01, 2017
  
  58e1c6dd
- Merge branch 'maint-0.3.0' into maint-0.3.1 · 751c7182
  Nick Mathewson authored Aug 01, 2017
  
  751c7182
- Merge branch 'maint-0.3.1' · ba7d6a1e
  Nick Mathewson authored Aug 01, 2017
  
  ba7d6a1e
- Merge branch 'maint-0.2.9' into maint-0.3.0 · f69797b6
  Nick Mathewson authored Aug 01, 2017
  
  f69797b6
- Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9 · 8500f0e4
  Nick Mathewson authored Aug 01, 2017
  
  8500f0e4
- Merge branch 'maint-0.3.0' into maint-0.3.1 · bf91b6e0
  Nick Mathewson authored Aug 01, 2017
  
  bf91b6e0
- Merge branch 'maint-0.3.1' · 2ee1a084
  Nick Mathewson authored Aug 01, 2017
  
  2ee1a084
- Merge remote-tracking branch 'public/bug20270_029' into maint-0.3.0 · 84c4a2bc
  Nick Mathewson authored Aug 01, 2017
  
  84c4a2bc
- Merge branch 'maint-0.3.0' into maint-0.3.1 · 9b65d7f4
  Nick Mathewson authored Aug 01, 2017
  
  9b65d7f4
- Merge branch 'maint-0.3.1' · 069728bd
  Nick Mathewson authored Aug 01, 2017
  
  069728bd
- Merge branch 'maint-0.2.9' into maint-0.3.0 · 7c68b2f1
  Nick Mathewson authored Aug 01, 2017
  
  7c68b2f1
- Merge remote-tracking branch 'public/bug22245_024' into maint-0.2.9 · 2b94b0ea
  Nick Mathewson authored Aug 01, 2017
  
  2b94b0ea
- Merge branch 'maint-0.3.0' into maint-0.3.1 · 5a739e59
  Nick Mathewson authored Aug 01, 2017
  
  5a739e59
- Merge branch 'maint-0.3.1' · a05ceaae
  Nick Mathewson authored Aug 01, 2017
  
  a05ceaae
- Merge branch 'maint-0.2.9' into maint-0.3.0 · 1d48712c
  Nick Mathewson authored Aug 01, 2017
  
  1d48712c
- Merge remote-tracking branch 'public/bug18100_029' into maint-0.2.9 · f6ecda84
  Nick Mathewson authored Aug 01, 2017
  
  f6ecda84
- Merge branch 'maint-0.3.0' into maint-0.3.1 · 4a19498e
  Nick Mathewson authored Aug 01, 2017
  
  4a19498e