2ff6ebc6fc
Merge branch 'maint-0.4.1'
...
Resolved modified/deleted conflict on changes/bug30649 by deleting
the file.
tor-github/pr/1282 modifies ChangeLog and ReleaseNotes instead of
changes/bug30649. We cherry-picked it to master, as well as merging
to release-0.4.1.
2019-09-05 12:08:02 +10:00
9dd908e713
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-09-05 12:05:12 +10:00
c08d3e46ca
Merge commit '73890a86ef' into maint-0.4.1
...
tor-github/pr/1283, with the following changes:
* cherry-pick the merge commit in 1283 on top of...
* tor-github/pr/1174, but with the last commit re-worded to remove
the fixup, because fixups break our push rules.
This is an "ours" merge, except for the bugfix version change in
changes/bug30649.
2019-09-05 12:04:27 +10:00
c1d61141f1
Add #30649 to ReleaseNotes.
2019-09-05 11:58:23 +10:00
87aaa9a2a5
Fix #30649 changelog entry.
2019-09-05 11:58:18 +10:00
73890a86ef
Merge branch 'bug30649_040' into bug30649_maint_041
2019-09-05 11:48:03 +10:00
61082c059c
Fix bugfix version in Bug 30649: Changes file.
2019-09-05 11:46:25 +10:00
1203e137be
Merge commit '763fd0ad66' into maint-0.4.0
...
tor-github/pr/1174, but with the last commit re-worded to remove
the fixup, because fixups break our push rules.
2019-09-05 11:42:26 +10:00
763fd0ad66
Fix bugfix version in Bug 30649: Changes file.
2019-09-05 11:41:45 +10:00
34f3fcef40
Merge branch 'tor-github/pr/1290'
2019-09-04 10:33:49 -04:00
4bcfa286f6
changes file for 31240
2019-09-04 10:31:45 -04:00
46a3820652
Merge remote-tracking branch 'tor-github/pr/1270'
2019-09-04 09:52:35 -04:00
c683896b7c
Update routerset reset test to use new mgr API.
2019-09-04 08:42:34 -04:00
17a870a64b
Merge branch 'ticket31240v2_merged_2' into ticket31240v2_merged_2_merged
2019-09-04 08:41:42 -04:00
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
c281fa0da2
Describe clear_cfg_fn_t better.
2019-08-29 09:14:51 -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
teor
George Kadianakis
David Goulet
Nick Mathewson
rl1987
Neel Chauhan