Commits · master · eighthave / Tor

23 Apr, 2021 4 commits
- Remove HSv2 leftovers after merging #18346 · 1d18ecbc
  David Goulet authored Apr 23, 2021
```
Signed-off-by: David Goulet <dgoulet@torproject.org>
```
  1d18ecbc
- Merge branch 'tor-gitlab/mr/327' · 3bd73672
  David Goulet authored Apr 23, 2021
```
Conflicts:
  src/test/test.c

  Minor comment issue.
```
  3bd73672
- Merge branch 'maint-0.4.6' · 973fcf05
  George Kadianakis authored Apr 23, 2021
  
  973fcf05
- Merge branch 'maint-0.4.5' into maint-0.4.6 · f0260c4c
  George Kadianakis authored Apr 23, 2021
  
  f0260c4c
21 Apr, 2021 6 commits
- hs: Fix memory leak in client cache · 8c297299
  David Goulet authored Apr 20, 2021
```
Fixes #40356
Signed-off-by: David Goulet <dgoulet@torproject.org>
```
  8c297299
- Merge branch 'maint-0.4.6' · fe9bd6bd
  Nick Mathewson authored Apr 21, 2021
  
  fe9bd6bd
- Merge branch 'maint-0.4.5' into maint-0.4.6 · 38bfb3cd
  Nick Mathewson authored Apr 21, 2021
  
  38bfb3cd
- Merge branch 'maint-0.4.4' into maint-0.4.5 · a4a37216
  Nick Mathewson authored Apr 21, 2021
  
  a4a37216
- Merge branch 'maint-0.3.5' into maint-0.4.4 · 87d96f71
  Nick Mathewson authored Apr 21, 2021
  
  87d96f71
- Merge remote-tracking branch 'tor-gitlab/mr/363' into maint-0.3.5 · 32eea3b0
  George Kadianakis authored Apr 21, 2021
  
  32eea3b0
19 Apr, 2021 12 commits
- Merge branch 'maint-0.4.6' · cbf71c4f
  Nick Mathewson authored Apr 19, 2021
  
  cbf71c4f
- Merge branch 'mr_347_squashed' into maint-0.4.6 · 0ceacb54
  Nick Mathewson authored Apr 19, 2021
  
  0ceacb54
- relay: Emit log warning if Address is internal and can't be used · 6281c908
  David Goulet authored Mar 25, 2021
```
Signed-off-by: David Goulet <dgoulet@torproject.org>
```
  6281c908
- Merge remote-tracking branch 'jigsaw/fix-40317_046-saveconf-sandbox-one-backup' · 07237b48
  Nick Mathewson authored Apr 19, 2021
  
  07237b48
- Merge branch 'maint-0.4.5' into maint-0.4.6 · d162b985
  Nick Mathewson authored Apr 19, 2021
  
  d162b985
- Merge branch 'maint-0.4.6' · de33be6e
  Nick Mathewson authored Apr 19, 2021
  
  de33be6e
- Tweak changes/ticket40369 to be a bug. · cd75eac7
  Nick Mathewson authored Apr 19, 2021
  
  cd75eac7
- scripts/build/combine_libs: use $AR rather than ar · f47c6c3d
  emery authored Apr 16, 2021
```
Using a custom ar at $AR may be necessary for cross-compilation.

Closes #40369
Signed-off-by: David Goulet <dgoulet@torproject.org>
```
  f47c6c3d
- Merge remote-tracking branch 'tor-gitlab/mr/364' · 7080e748
  George Kadianakis authored Apr 19, 2021
  
  7080e748
- Merge branch 'maint-0.4.5' into maint-0.4.6 · 461a3c73
  George Kadianakis authored Apr 19, 2021
  
  461a3c73
- Merge branch 'maint-0.4.6' · 874d2c86
  George Kadianakis authored Apr 19, 2021
  
  874d2c86
- Merge remote-tracking branch 'tor-gitlab/mr/355' into maint-0.4.5 · 925ec0e0
  George Kadianakis authored Apr 19, 2021
  
  925ec0e0
15 Apr, 2021 4 commits
- Bump to 0.4.7.0-alpha-dev · e7c407d9
  Nick Mathewson authored Apr 15, 2021
  
  e7c407d9
- Merge branch 'maint-0.4.6' · 8f78243f
  Nick Mathewson authored Apr 15, 2021
```
"ours" to avoid version bump.
```
  8f78243f
- Bump to 0.4.6.2-alpha-dev · e6d9dd91
  Nick Mathewson authored Apr 15, 2021
  
  e6d9dd91
- Add 0.4.6 to git-list-tor-branches.sh · d6ebd816
  Nick Mathewson authored Apr 15, 2021
  
  d6ebd816
14 Apr, 2021 10 commits
- two more changelog fixes from arma · 284f4452
  Nick Mathewson authored Apr 14, 2021
  
  284f4452
- changelog edits from arma · c5f84ce6
  Nick Mathewson authored Apr 14, 2021
  
  c5f84ce6
- light changelog edits · 943d4834
  Nick Mathewson authored Apr 14, 2021
  
  943d4834
- Start a changes file for 0.4.6.2-alpha · 33ca927a
  Nick Mathewson authored Apr 14, 2021
  
  33ca927a
- Bump version to 0.4.6.2-alpha. · 96d44664
  Nick Mathewson authored Apr 14, 2021
  
  96d44664
- geoip script: add options to output AS numbers. · e7115442
  Nick Mathewson authored Apr 14, 2021
```
The --include-asn option includes AS numbers in the geoip mapping.

The --output-asn option makes the program generate a number-to-name
mapping file.

Additionally, the script now outputs ?? CC entries for networks that
are listed but which have no country known.
```
  e7115442
- Merge branch 'maint-0.4.5' · 91569c4d
  David Goulet authored Apr 14, 2021
  
  91569c4d
- Merge branch 'maint-0.3.5' into maint-0.4.4 · bba3393d
  David Goulet authored Apr 14, 2021
  
  bba3393d
- Merge branch 'maint-0.4.4' into maint-0.4.5 · 30fa80c0
  David Goulet authored Apr 14, 2021
  
  30fa80c0
- fallbackdir: Remove two unspec lines · 131e2d99
  David Goulet authored Apr 14, 2021
```
Signed-off-by: David Goulet <dgoulet@torproject.org>
```
  131e2d99
13 Apr, 2021 4 commits
- Fix test naming, and fix tests on windows. · 5e6905ed
  Nick Mathewson authored Apr 13, 2021
```
This is a bugfix against my fix for #40133, which has not yet
appeared in 0.3.5.
```
  5e6905ed
- Clean up the CONNECTION_TESTCASE_ARG macro. · 8b22c80f
  Nick Mathewson authored Apr 13, 2021
  
  8b22c80f
- Merge branch 'maint-0.4.5' · 28157212
  Nick Mathewson authored Apr 13, 2021
  
  28157212
- Merge branch 'maint-0.4.4' into maint-0.4.5 · 59bc377d
  Nick Mathewson authored Apr 13, 2021
  
  59bc377d