Nick Mathewson
78307ed186
Merge remote-tracking branch 'tor-github/pr/1272'
2019-09-02 14:13:32 -04:00
Nick Mathewson
01bda9bed1
Merge branch 'maint-0.4.1'
2019-09-02 14:11:32 -04:00
Nick Mathewson
e3a458e441
Merge branch 'ticket12399_035' into maint-0.4.1
2019-09-02 14:11:18 -04:00
rl1987
05fa1689eb
Change loglevel of message 'Hash of session info was not as expected'
2019-09-02 14:09:39 -04:00
teor
f538e23986
ChangeLog/ReleaseNotes: fix some incorrect bugfix versions
...
Closes 31461.
2019-09-02 13:29:17 -04:00
teor
a3fad4d057
ChangeLog/ReleaseNotes: fix a typo in the 0.4.1 changes entries
...
Part of 31461.
2019-09-02 13:29:12 -04:00
teor
340698ba10
Merge branch 'maint-0.4.1'
2019-08-30 23:33:18 +10:00
teor
25e7fc5b7a
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-08-30 23:33:10 +10:00
teor
a52a5e0099
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-30 23:33:01 +10:00
teor
1132dc9f75
Merge remote-tracking branch 'tor-github/pr/1181' into maint-0.3.5
2019-08-30 23:24:05 +10:00
teor
b66712d85b
Merge remote-tracking branch 'tor-github/pr/1117' into maint-0.3.5
2019-08-30 23:22:18 +10:00
teor
4662cbec7b
Merge remote-tracking branch 'tor-github/pr/1114' into maint-0.3.5
2019-08-30 23:20:59 +10:00
David Goulet
88a8deb420
Merge branch 'tor-github/pr/1236'
2019-08-29 12:58:25 -04:00
teor
e155598fe3
scripts/git: fix shellcheck issues in git-push-all.sh
...
Part of 31314.
2019-08-29 23:13:29 +10:00
teor
340ff7f5f8
scripts/git: fix an env var typo in git-merge-forward.sh
...
Part of 31314.
2019-08-29 22:58:53 +10:00
David Goulet
960d989415
Merge branch 'tor-github/pr/1257'
2019-08-29 08:56:04 -04:00
David Goulet
7c99a4ddde
Merge branch 'maint-0.4.1'
2019-08-29 08:55:58 -04:00
David Goulet
ff905f8e1e
Merge branch 'tor-github/pr/1256' into maint-0.4.1
2019-08-29 08:55:31 -04:00
David Goulet
337b733cfc
Merge branch 'tor-github/pr/1255' into maint-0.4.1
2019-08-29 08:55:27 -04:00
teor
d0e31b4d1f
scripts/git: Quote shell arguments where possible
...
Most shell arguments should be quoted to avoid mistakes.
But since all branch names are hard-coded, or supplied by the script user,
we don't need to be too concerned about command injection.
Quoting all shell arguments would take a major refactor.
(Probably using arrays.)
Part of 31314.
2019-08-29 22:53:44 +10:00
teor
664e6a392e
scripts/git: Improve usage documentation for merge-forward and push-all
...
Part of 31314.
2019-08-29 22:52:21 +10:00
teor
b47b71ad2f
scripts/git: Let git-push-all.sh skip unchanged test branches
...
Skip test branches that are the same as remote maint/release/master
branches.
Add a TOR_PUSH_SAME and -s argument to git-push-all.sh to change this
default.
Part of 31314.
2019-08-29 22:50:47 +10:00
teor
70387054b9
scripts/git: Make the git push command and args configurable
...
TOR_GIT_PUSH provides the git push command and default arguments.
Also fix handling of git-push-all.sh script arguments and arguments that
are passed through to $TOR_GIT_PUSH, using a "--" argument as a separator.
Fix on 29879.
2019-08-29 22:50:37 +10:00
teor
15782758c7
scripts/git: Allow git-merge-forward.sh to re-use existing test branches
...
Add a -u argument to git-merge-forward.sh, so that the script can
re-use existing test branches after a merge failure and fix.
Part of 31314.
2019-08-29 22:47:50 +10:00
teor
667311ebbd
scripts/git: Add test branch support to the git scripts
...
Add a -t <test-branch-prefix> argument to git-merge-forward.sh and
git-push-all.sh, which makes these scripts create, merge forward, and
push test branches.
Add a -r <remote-name> argument to git-push-all.sh, so the script can
push test branches to a personal remote.
Closes ticket 31314.
2019-08-29 22:47:43 +10:00
teor
c98724b022
scripts/git: Cleanup and fix minor git scripts issues
...
Fix typos, clean up formatting, rewrite some comments, add headings.
Preparation for 31314.
2019-08-29 22:42:37 +10:00
Nick Mathewson
04ab357df8
Remove extraneous "n" from comment in routerset.c
2019-08-28 11:39:31 -04:00
George Kadianakis
357e9a6f2c
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-27 11:49:36 +03:00
George Kadianakis
5a73f369db
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-08-27 11:49:36 +03:00
George Kadianakis
35e978da61
Merge branch 'maint-0.4.1'
2019-08-27 11:49:36 +03:00
George Kadianakis
78e084a12e
Merge branch 'tor-github/pr/1267'
2019-08-27 11:47:46 +03:00
George Kadianakis
761a0ec3d1
Merge remote-tracking branch 'arma/ticket31498'
2019-08-27 11:46:52 +03:00
George Kadianakis
92a8573d22
Merge branch 'tor-github/pr/1258'
2019-08-27 11:45:18 +03:00
George Kadianakis
0d7f76d7ca
Merge branch 'tor-github/pr/1234'
2019-08-27 11:44:13 +03:00
George Kadianakis
5782cee71d
Merge branch 'tor-github/pr/1237'
2019-08-27 11:43:10 +03:00
Nick Mathewson
8af92b6577
test_address: parenthesize macro arguments.
...
It's good style to always add parentheses when using macro
arguments, in case somebody someday provides an argument that
contains an operator you don't expect, or causes the expression to
parse differently.
2019-08-26 20:03:16 -04:00
Nick Mathewson
5eca338107
In tests, make sure that "ri" is freed on all paths.
...
In Tor's tests, the tt_*() macros can call "goto done" on failure.
When that happens, we need to make sure that all of our allocated
memory still gets freed, or else Coverity will complain.
2019-08-26 20:03:11 -04:00
Neel Chauhan
c8e69e63f9
Add test for dirserv_router_has_valid_address()
2019-08-26 20:02:11 -04:00
Neel Chauhan
cc5af6dbd5
Add changes file for Bug #31088
2019-08-26 20:02:11 -04:00
Neel Chauhan
d9a7d47798
Check for private IPv6 addresses in dirserv_router_has_valid_address()
2019-08-26 18:21:56 -04:00
David Goulet
d819dfbded
Merge branch 'tor-github/pr/1239'
2019-08-26 14:35:27 -04:00
George Kadianakis
859514d477
Merge branch 'tor-github/pr/1263'
2019-08-26 17:35:34 +03:00
Nick Mathewson
eff95429fd
Merge remote-tracking branch 'tor-github/pr/1241'
2019-08-26 10:15:25 -04:00
Nick Mathewson
ca667b9a8a
Fix/suppress shellcheck warnings in git-push-all.sh
...
(I've chosen to suppress some instances rather than 'fix' them,
since the fix would require arrays or major refactoring.)
Fixes bug 31519; bug not in any released Tor.
2019-08-26 09:58:38 -04:00
David Goulet
24bc2cd7b5
Merge branch 'tor-github/pr/1254'
2019-08-26 09:38:24 -04:00
Nick Mathewson
38c4e1426c
changes file for ticket30935
2019-08-26 09:33:29 -04:00
Nick Mathewson
cde662e259
clarify usage of __ and ___ prefixes on config options
2019-08-24 17:46:08 -04:00
Nick Mathewson
078ba326a1
Make a function for NODUMP.
2019-08-24 17:40:48 -04:00
Nick Mathewson
eb54fe8f97
Make config_var_is_invisible a function.
2019-08-24 17:32:46 -04:00
Nick Mathewson
65511a45ad
Fix comment: ___ options are now that way because of the INVISIBLE flag.
2019-08-24 17:26:02 -04:00
