f5fa283a04
Merge branch 'tor-github/pr/1288'
2019-09-04 08:34:26 -04:00
a816742f37
Merge branch 'maint-0.4.1'
2019-09-04 08:33:28 -04:00
630bb113a0
Merge branch 'tor-github/pr/1271' into maint-0.4.1
2019-09-04 08:33:10 -04:00
6210c75076
Merge branch 'tor-github/pr/1246'
2019-09-04 08:27:36 -04:00
9c798dd5a5
torerr: Fix a comment typo and update the comment for format_number_sigsafe()
...
Closes 31612.
2019-09-04 14:06:58 +10:00
7fa624537c
Merge branch 'tor-github/pr/1269'
2019-09-03 17:11:25 +03:00
a617001fd4
Merge remote-tracking branch 'tor-github/pr/1279'
2019-09-03 09:47:25 -04:00
78307ed186
Merge remote-tracking branch 'tor-github/pr/1272'
2019-09-02 14:13:32 -04:00
01bda9bed1
Merge branch 'maint-0.4.1'
2019-09-02 14:11:32 -04:00
e3a458e441
Merge branch 'ticket12399_035' into maint-0.4.1
2019-09-02 14:11:18 -04:00
05fa1689eb
Change loglevel of message 'Hash of session info was not as expected'
2019-09-02 14:09:39 -04:00
f538e23986
ChangeLog/ReleaseNotes: fix some incorrect bugfix versions
...
Closes 31461.
2019-09-02 13:29:17 -04:00
a3fad4d057
ChangeLog/ReleaseNotes: fix a typo in the 0.4.1 changes entries
...
Part of 31461.
2019-09-02 13:29:12 -04:00
d22ed05dc0
Space out the arguments to the cell functions in rend_process_relay_cell()
2019-08-30 18:58:00 -04:00
340698ba10
Merge branch 'maint-0.4.1'
2019-08-30 23:33:18 +10:00
25e7fc5b7a
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-08-30 23:33:10 +10:00
a52a5e0099
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-30 23:33:01 +10:00
1132dc9f75
Merge remote-tracking branch 'tor-github/pr/1181' into maint-0.3.5
2019-08-30 23:24:05 +10:00
b66712d85b
Merge remote-tracking branch 'tor-github/pr/1117' into maint-0.3.5
2019-08-30 23:22:18 +10:00
4662cbec7b
Merge remote-tracking branch 'tor-github/pr/1114' into maint-0.3.5
2019-08-30 23:20:59 +10:00
88a8deb420
Merge branch 'tor-github/pr/1236'
2019-08-29 12:58:25 -04:00
e3f7e5e65e
practracker: make filename terminology uniform
...
Previously we often referred to "C files" and "H files", which is
more ambiguous than ".c files" and ".h files".
2019-08-29 09:20:27 -04:00
e155598fe3
scripts/git: fix shellcheck issues in git-push-all.sh
...
Part of 31314.
2019-08-29 23:13:29 +10:00
340ff7f5f8
scripts/git: fix an env var typo in git-merge-forward.sh
...
Part of 31314.
2019-08-29 22:58:53 +10:00
960d989415
Merge branch 'tor-github/pr/1257'
2019-08-29 08:56:04 -04:00
7c99a4ddde
Merge branch 'maint-0.4.1'
2019-08-29 08:55:58 -04:00
ff905f8e1e
Merge branch 'tor-github/pr/1256' into maint-0.4.1
2019-08-29 08:55:31 -04:00
337b733cfc
Merge branch 'tor-github/pr/1255' into maint-0.4.1
2019-08-29 08:55:27 -04:00
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
664e6a392e
scripts/git: Improve usage documentation for merge-forward and push-all
...
Part of 31314.
2019-08-29 22:52:21 +10:00
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
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
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
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
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
664d1b4366
test: Change "make test-stem" so it only runs the stem tests that use tor
...
This change makes test-stem faster and more reliable.
Use "make test-stem-full" to run all of stem's tests.
Closes ticket 31554.
2019-08-29 21:56:16 +10:00
1ef084c5fc
test_confparse: verify that clearing a routerset sets it to NULL.
2019-08-28 12:28:17 -04:00
f0c1f96adc
Document configuration type definition functions for routerset_t
...
These functions are all used to implement the ROUTERSET_type_defn
object, which maps strings to and from routerset_t configuration
variables for the configuration module.
2019-08-28 12:23:36 -04:00
2074fed664
Routerset config parsing: represent empty sets as NULL.
...
routerset_t has two representations of an empty routerset: NULL, and
a set containing no elements. But some of our config code assumes
that empty routersets are represented as NULL. So let's give it
what it assumes.
Fixes bug 31495. Bugfix on e16b90b88a76; but not in any released
Tor.
2019-08-28 11:53:28 -04:00
04ab357df8
Remove extraneous "n" from comment in routerset.c
2019-08-28 11:39:31 -04:00
357e9a6f2c
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-27 11:49:36 +03:00
5a73f369db
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-08-27 11:49:36 +03:00
35e978da61
Merge branch 'maint-0.4.1'
2019-08-27 11:49:36 +03:00
78e084a12e
Merge branch 'tor-github/pr/1267'
2019-08-27 11:47:46 +03:00
761a0ec3d1
Merge remote-tracking branch 'arma/ticket31498'
2019-08-27 11:46:52 +03:00
92a8573d22
Merge branch 'tor-github/pr/1258'
2019-08-27 11:45:18 +03:00
0d7f76d7ca
Merge branch 'tor-github/pr/1234'
2019-08-27 11:44:13 +03:00
5782cee71d
Merge branch 'tor-github/pr/1237'
2019-08-27 11:43:10 +03:00
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
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
David Goulet
teor
George Kadianakis
Nick Mathewson
rl1987
Neel Chauhan