teor
51b792b000
scripts: Allow git-push-all.sh to be run from any directory
...
Closes 31678.
2019-09-10 12:10:28 +10:00
David Goulet
796a9b37ea
Merge branch 'tor-github/pr/1264'
2019-09-09 14:53:12 -04:00
Nick Mathewson
a642a4cbd7
Merge branch 'ticket30924_042_04_squashed' into ticket30924_042_04_squashed_merged
2019-09-09 11:10:53 -04:00
David Goulet
1e7c7870e8
Merge branch 'tor-github/pr/1287'
2019-09-09 10:51:19 -04:00
Nick Mathewson
380d178e53
changes file for ticket31477
2019-09-05 16:20:31 -04:00
George Kadianakis
c750ec20ab
Merge branch 'tor-github/pr/1291'
2019-09-05 17:09:20 +03:00
George Kadianakis
c29f05b159
Merge branch 'tor-github/pr/1292'
2019-09-05 17:06:58 +03:00
George Kadianakis
cdd7e88970
Merge branch 'tor-github/pr/1261'
2019-09-05 17:02:53 +03:00
Neel Chauhan
be4a60945d
Check IPv6 exit policies on microdescriptors in node_exit_policy_rejects_all()
2019-09-05 17:02:45 +03:00
teor
4b1d2ba979
changes: file for 30967
2019-09-05 11:15:30 +10:00
Nick Mathewson
106b75aa53
changes file for 31532
2019-09-04 12:06:27 -04:00
Nick Mathewson
870874fec8
config: Make CLEAR with a nonempty value into a nonfatal assertion.
...
When we parse a CLEAR line (e.g., "/OrPort" or /OrPort blah blah"),
we always suppress the value, even if one exists. That means that
the block of code was meant to handle CLEAR lines didn't actually do
anything, since we previously handled them the same way as with
other empty values.
Closes ticket 31529.
2019-09-04 11:28:21 -04:00
David Goulet
34f3fcef40
Merge branch 'tor-github/pr/1290'
2019-09-04 10:33:49 -04:00
Nick Mathewson
4bcfa286f6
changes file for 31240
2019-09-04 10:31:45 -04:00
Nick Mathewson
46a3820652
Merge remote-tracking branch 'tor-github/pr/1270'
2019-09-04 09:52:35 -04:00
David Goulet
a816742f37
Merge branch 'maint-0.4.1'
2019-09-04 08:33:28 -04:00
David Goulet
630bb113a0
Merge branch 'tor-github/pr/1271' into maint-0.4.1
2019-09-04 08:33:10 -04:00
teor
193c74faf9
Merge branch 'bug31571_041' into bug31571_master
2019-09-04 13:57:39 +10:00
teor
abe1f4f23e
Merge branch 'bug31571_040' into bug31571_041
2019-09-04 13:57:36 +10:00
teor
0cee6f498c
Merge branch 'bug31571_035' into bug31571_040
2019-09-04 13:57:31 +10:00
teor
a836dd2530
Merge branch 'maint-0.3.5' into bug31571_035
2019-09-04 13:57:15 +10:00
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
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
teor
c55591825f
torerr: Try harder to flush raw assert messages before process termination
...
Some platforms (macOS, maybe others?) can swallow the last write before an
abort. This issue is probably caused by a race condition between write
buffer cache flushing, and process termination. So we write an extra
newline, to make sure that the message always gets through.
Fixes bug 31571; bugfix on 0.3.5.1-alpha.
2019-08-30 21:51:11 +10:00
David Goulet
88a8deb420
Merge branch 'tor-github/pr/1236'
2019-08-29 12:58:25 -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
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
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
teor
ec6fbf1ca6
nodelist: Use safe string functions in describe.c
...
Rewrite format_node_description() and router_get_verbose_nickname() to
use strlcpy() and strlcat(). The previous implementation used memcpy()
and pointer arithmetic, which was error-prone.
Closes ticket 31545. This is CID 1452819.
2019-08-29 13:09:08 +10: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
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
Neel Chauhan
cc5af6dbd5
Add changes file for Bug #31088
2019-08-26 20:02:11 -04:00
Nick Mathewson
eff95429fd
Merge remote-tracking branch 'tor-github/pr/1241'
2019-08-26 10:15:25 -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
David Goulet
f95b5d07c1
hs-v3: Add changes file for prop305 implementation
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-08-26 15:53:46 +03:00
