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
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
35e978da61
Merge branch 'maint-0.4.1'
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
357e9a6f2c
Merge branch 'maint-0.3.5' into maint-0.4.0
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
Nick Mathewson
03247c8eaa
whitespace fix
2019-08-24 17:11:41 -04:00
Nick Mathewson
6ba05eea8e
Merge remote-tracking branch 'tor-github/pr/1247'
2019-08-24 16:32:50 -04:00
Nick Mathewson
7a45c9c1d2
Merge remote-tracking branch 'tor-github/pr/1215'
2019-08-24 16:30:55 -04:00
Nick Mathewson
f1707f7db3
Merge branch 'maint-0.4.1'
2019-08-24 16:29:23 -04:00
Roger Dingledine
272265efbd
clarify that tor's license is free software
...
no actual changes to the license.
this way folks who don't immediately recognize the text of the 3-clause
bsd can be reassured that we're using a standard license.
closes ticket #31498
2019-08-23 21:52:33 -04:00
Neel Chauhan
14654d5c97
Remove the unused circuit_type field from hs_ident_circuit_t and hs_ident_circuit_new()
2019-08-23 14:04:05 -04:00
Nick Mathewson
2780cbb9cb
Merge branch 'ticket30935' into ticket30935_merged
2019-08-22 17:25:35 -04:00
David Goulet
d475d7c2fb
Merge branch 'tor-github/pr/1244'
2019-08-22 17:10:22 -04:00
teor
5794523f80
changes: file for 21003
...
Log IPv6 addresses as well as IPv4 addresses, when describing
routerinfos, routerstatuses, and nodes.
Closes ticket 21003.
2019-08-23 00:06:55 +10:00
teor
1ebff4d7f3
test/nodelist: Add unit tests for describe.c
...
Part of 21003.
2019-08-23 00:02:33 +10:00
teor
e8ba094c3e
nodelist: Clear buffers and detect more caller errors in describe.c
...
Part of 21003.
2019-08-22 23:51:32 +10:00
teor
7c92f4faa2
Merge branch 'bug31463_040' into bug31463_041
2019-08-22 22:10:06 +10:00
teor
8b32d22a07
Merge branch 'bug31463_035' into bug31463_040
2019-08-22 22:10:00 +10:00
Sebastian Hahn
190386f1c4
Fix gcc build exclude on travis
...
The main build doesn't use HARDENING_OPTIONS, so the exclude shouldn't,
either. Reduces the number of builders by one.
2019-08-22 22:09:32 +10:00
Antoine Veuiller
3bf90e704c
doc(hacking): update = to # on sections
2019-08-21 16:22:37 +02:00
Antoine Veuiller
0d6c8eed49
doc(hacking): enhance markdown style
2019-08-21 16:22:08 +02:00
Nick Mathewson
cc48eff2d3
Merge branch 'ticket31176' into ticket31176_merged
2019-08-21 09:46:20 -04:00
Nick Mathewson
edf5a327c5
Merge branch 'ticket30914' into ticket30914_merged
2019-08-20 13:57:05 -04:00
