Commits · master · Alexander Færøy / tor-clone

29 Apr, 2019 3 commits
- Merge remote-tracking branch 'tor-github/pr/972' · 44e6663b
  Nick Mathewson authored Apr 29, 2019
  
  44e6663b
- Merge branch 'maint-0.4.0' · 206d28ff
  Nick Mathewson authored Apr 29, 2019
  
  206d28ff
- Merge remote-tracking branch 'tor-github/pr/974' into maint-0.4.0 · 593d2992
  Nick Mathewson authored Apr 29, 2019
  
  593d2992
26 Apr, 2019 2 commits
- Merge remote-tracking branch 'tor-github/pr/889' · efeb101b
  Nick Mathewson authored Apr 25, 2019
  
  efeb101b
- Merge remote-tracking branch 'tor-github/pr/922' · 36b4fc74
  Nick Mathewson authored Apr 25, 2019
  
  36b4fc74
25 Apr, 2019 3 commits
- Merge branch 'maint-0.4.0' · 974c2674
  George Kadianakis authored Apr 25, 2019
  
  974c2674
- Merge branch 'tor-github/pr/960' into maint-0.4.0 · a39789a0
  George Kadianakis authored Apr 25, 2019
  
  a39789a0
- Merge branch 'tor-github/pr/953' · 811a93f8
  George Kadianakis authored Apr 25, 2019
  
  811a93f8
24 Apr, 2019 8 commits
- Merge remote-tracking branch 'tor-github/pr/942' · 6320b298
  Nick Mathewson authored Apr 24, 2019
  
  6320b298
- Merge remote-tracking branch 'tor-github/pr/964' · 0cbe0f9c
  Nick Mathewson authored Apr 24, 2019
  
  0cbe0f9c
- Allow do_resolve() to be longer. · d0a0f3e8
  Nick Mathewson authored Apr 24, 2019
  
  d0a0f3e8
- Merge branch 'tor-github/pr/951' · f39dd0a7
  David Goulet authored Apr 24, 2019
  
  f39dd0a7
- Merge branch 'tor-github/pr/943' · 608cf2ba
  David Goulet authored Apr 24, 2019
  
  608cf2ba
- Merge branch 'tor-github/pr/955' · 5bcf87c2
  David Goulet authored Apr 24, 2019
  
  5bcf87c2
- Merge branch 'tor-github/pr/939' · 4b599aaa
  David Goulet authored Apr 24, 2019
  
  4b599aaa
- Merge branch 'tor-github/pr/930' · 4587e67d
  David Goulet authored Apr 24, 2019
  
  4587e67d
23 Apr, 2019 10 commits
- Merge remote-tracking branch 'tor-github/pr/944' · 15d42383
  Nick Mathewson authored Apr 23, 2019
  
  15d42383
- Rename outvar to follow _out convention. · 8bea0c2f
  Nick Mathewson authored Apr 23, 2019
  
  8bea0c2f
- Merge remote-tracking branch 'tor-github/pr/935' · 475ac11b
  Nick Mathewson authored Apr 23, 2019
  
  475ac11b
- Merge remote-tracking branch 'tor-github/pr/971' · 6559aefc
  Nick Mathewson authored Apr 23, 2019
  
  6559aefc
- Merge branch 'ticket30051_take2_squashed' · b0459de2
  Nick Mathewson authored Apr 23, 2019
  
  b0459de2
- Add changes file · 0c78811c
  rl1987 authored Apr 19, 2019
  
  0c78811c
- Call practracker from pre-push and pre-commit hooks · a85cd5b4
  rl1987 authored Apr 19, 2019
  
  a85cd5b4
- Merge remote-tracking branch 'tor-github/pr/962' · a7599c5b
  Nick Mathewson authored Apr 23, 2019
  
  a7599c5b
- Stop looking for scripts in the build directory during "make shellcheck" · 1788343a
  teor authored Apr 23, 2019
```
Fixes bug 30263; bugfix on 0.4.0.1-alpha.
```
  1788343a
- Coding Standards: Document how to find git commits · ac5753d3
  teor authored Apr 23, 2019
```
Document how to find git commits and tags for bug fixes in
CodingStandards.md.

And update some changes file documentation.

Closes ticket 30261.
```
  ac5753d3
22 Apr, 2019 1 commit
- Travis: Show stem's tor log after failure · 9a97b5ff
  teor authored Apr 22, 2019
```
Closes ticket 30234.
```
  9a97b5ff
19 Apr, 2019 13 commits
- Initialize rate_limited in hs_pick_hsdir() to false · 2ab19a48
  Neel Chauhan authored Apr 19, 2019
  
  2ab19a48
- Only set rate_limited in hs_pick_hsdir() if rate_limited_count or... · efde686a
  Neel Chauhan authored Apr 19, 2019
```
Only set rate_limited in hs_pick_hsdir() if rate_limited_count or responsible_dirs_count is greater than 0
```
  efde686a
- Initialize rate_limited to false in directory_get_from_hs_dir() · 144bc502
  Neel Chauhan authored Apr 19, 2019
  
  144bc502
- Make rate_limited and is_rate_limited a bool · 943559b1
  Neel Chauhan authored Apr 19, 2019
  
  943559b1
- Merge branch 'maint-0.4.0' · 4b8c77a5
  teor authored Apr 19, 2019
  
  4b8c77a5
- Merge branch 'maint-0.3.5' into maint-0.4.0 · 24b68b47
  teor authored Apr 19, 2019
  
  24b68b47
- Merge branch 'maint-0.3.4' into maint-0.3.5 · 231036a1
  teor authored Apr 19, 2019
  
  231036a1
- Merge branch 'maint-0.2.9' into maint-0.3.4 · cbce8ded
  teor authored Apr 19, 2019
```
"ours" merge, to avoid taking any changes from PR 792 in 0.3.4.
(We already merged PR 791 for 29665 into 0.3.4.)
```
  cbce8ded
- Merge remote-tracking branch 'tor-github/pr/710' into maint-0.3.5 · 742b5b32
  teor authored Apr 19, 2019
  
  742b5b32
- Merge remote-tracking branch 'tor-github/pr/726' into maint-0.3.5 · cb084de5
  teor authored Apr 19, 2019
  
  cb084de5
- Merge remote-tracking branch 'tor-github/pr/745' into maint-0.3.5 · 2ae67fee
  teor authored Apr 19, 2019
  
  2ae67fee
- Merge remote-tracking branch 'tor-github/pr/947' into maint-0.3.5 · 4a66c2d6
  teor authored Apr 19, 2019
  
  4a66c2d6
- Merge remote-tracking branch 'tor-github/pr/946' into maint-0.3.4 · 116970dd
  teor authored Apr 19, 2019
  
  116970dd