teor
03c2b1be8d
dirauth: reorder the checks in dirserv_router_has_valid_address()
...
To avoid a bug warning.
Fixes 31793. Bug not in any release, no changes file required.
2019-09-19 16:19:12 +10:00
teor
46fea1dfee
test: dirserv_router_has_valid_address() with zero-family addresses
...
Sometimes tor doesn't initialise an address, so its family is zero.
Failing test for 31793. Future commits will fix the code.
2019-09-19 16:19:04 +10:00
Nick Mathewson
d6d3e829dd
Merge branch 'maint-0.4.1'
2019-09-18 08:07:56 -04:00
Nick Mathewson
70bcff6010
Merge branch 'bug31772_041' into maint-0.4.1
2019-09-18 08:07:50 -04:00
Nick Mathewson
7225cfc586
Merge branch 'maint-0.4.1'
2019-09-17 21:28:38 -04:00
Nick Mathewson
5f00c03ed0
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-09-17 21:28:38 -04:00
Nick Mathewson
9e674d0eb4
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-09-17 21:28:37 -04:00
Nick Mathewson
02840169d8
Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5
2019-09-17 21:28:29 -04:00
Nick Mathewson
2013e63acc
Merge branch 'maint-0.4.1'
2019-09-17 21:26:32 -04:00
Nick Mathewson
c3e94a8ccd
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-09-17 21:26:32 -04:00
Nick Mathewson
a1f97bb253
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-09-17 21:26:31 -04:00
Nick Mathewson
50b45c43eb
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-09-17 21:26:31 -04:00
Nick Mathewson
967460389a
Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9
2019-09-17 21:26:17 -04:00
Nick Mathewson
25af8ada30
Correct the syntax description for the MAPADDRESS command.
...
In 0.4.1.1-alpha I introduced a bug where we would require and
ignore a single positional argument.
Fixes bug 31772.
2019-09-17 19:26:45 -04:00
Nick Mathewson
93def2bb4f
Merge branch 'maint-0.4.1'
...
"ours" to avoid version bump.
2019-09-17 19:12:08 -04:00
Nick Mathewson
a3342b382a
Bump version to 0.4.1.6
2019-09-17 19:11:56 -04:00
Nick Mathewson
48afec91ce
Merge branch 'maint-0.4.1'
2019-09-17 19:05:13 -04:00
Nick Mathewson
c6f7943269
Merge branch 'bug31570_041' into maint-0.4.1
2019-09-17 19:04:25 -04:00
Nick Mathewson
48b2815879
Merge branch 'maint-0.4.1'
2019-09-17 18:58:44 -04:00
Nick Mathewson
50f981719f
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-09-17 18:58:44 -04:00
Nick Mathewson
ef35435584
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-09-17 18:58:43 -04:00
Nick Mathewson
dc41e6a80c
Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5
2019-09-17 18:58:06 -04:00
Nick Mathewson
2ebe1fcd52
Merge branch 'maint-0.2.9' into maint-0.3.5
...
"ours" merge to avoid picking up 0.2.9 version of ticket 31673.
2019-09-17 18:57:49 -04:00
Nick Mathewson
dcd6462605
Merge branch 'maint-0.4.1'
2019-09-17 18:56:52 -04:00
Nick Mathewson
cec42be570
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-09-17 18:56:52 -04:00
Nick Mathewson
88cf964ca3
Merge branch 'maint-0.4.1'
2019-09-17 18:55:18 -04:00
Nick Mathewson
ab74c3560a
Merge branch 'ticket31552_041' into maint-0.4.1
2019-09-17 18:54:05 -04:00
Nick Mathewson
75d3c08219
bump to 0.4.2.1-alpha-dev
2019-09-17 11:36:43 -04:00
Nick Mathewson
b5f39955d1
pick a release date for 0.4.2.1-alpha
2019-09-17 08:19:28 -04:00
Nick Mathewson
9bbddbcb21
Run format_changelog again
2019-09-17 08:00:47 -04:00
Nick Mathewson
1f0848e0b6
Fold new entries into 0.4.2.1-alpha changelog
2019-09-17 08:00:24 -04:00
George Kadianakis
585eaa123f
Merge branch 'tor-github/pr/1323'
2019-09-17 14:51:43 +03:00
Nick Mathewson
a28a682a1f
bump version to 0.4.2.1-alpha
2019-09-16 16:24:24 -04:00
Nick Mathewson
68a0106bf3
Run "make autostyle" and fix wide lines.
2019-09-16 13:27:42 -04:00
Nick Mathewson
7cd68b04de
Fold one more entry into changelog.
2019-09-16 12:50:56 -04:00
George Kadianakis
8f2ab45229
Merge branch 'tor-github/pr/1313'
2019-09-16 19:45:20 +03:00
George Kadianakis
9877423736
Merge branch 'tor-github/pr/1312'
2019-09-16 19:44:33 +03:00
George Kadianakis
8377b610bd
Merge branch 'tor-github/pr/1327'
2019-09-16 19:43:44 +03:00
Nick Mathewson
8ad419744f
On windows, allow failures in test_parseconf.sh
...
There seems to be some unreliability issue with this test on
appveyor.
Addresses ticket 31757; This isn't a final fix for this issue, but
it should make CI pass.
2019-09-16 11:01:03 -04:00
Nick Mathewson
f6ea890241
Fix various grammar/style/type issues in 0.4.2.1-alpha changelog
...
Fixes by seborn.
2019-09-16 10:25:21 -04:00
Nick Mathewson
a1694b7363
Fix a shellcheck warning in test_parseconf.sh.
...
I wonder why this didn't show up before.
2019-09-16 09:22:43 -04:00
Nick Mathewson
f281c3637a
hand-edits to 0.4.2.1-alpha changelog
2019-09-16 09:18:20 -04:00
Nick Mathewson
804260828b
sort and coalesce some changelog sections
2019-09-16 08:40:21 -04:00
Nick Mathewson
1f4a7a4bb1
Run format-changelog, add a stub blurb.
2019-09-16 08:33:10 -04:00
Nick Mathewson
cbd3b01863
Start a changelog for 0.4.2.1-alpha
...
This commit sorts the changes files using sortChanges, and inserts
them into a changelog entry.
2019-09-16 08:32:01 -04:00
George Kadianakis
cd72850e08
Merge branch 'tor-github/pr/1316'
2019-09-16 15:22:18 +03:00
George Kadianakis
5ec751b38b
Merge branch 'tor-github/pr/1324'
2019-09-16 15:21:28 +03:00
George Kadianakis
a1192b6b4a
Merge branch 'tor-github/pr/1273'
2019-09-16 15:20:25 +03:00
George Kadianakis
bdd17da9fd
Merge branch 'tor-github/pr/1318'
2019-09-16 15:19:38 +03:00
Nick Mathewson
11cf4d9c3a
test_parseconf.sh: On --dump-config failure, --verify-config
2019-09-14 19:00:41 -04:00
