c750ec20ab
Merge branch 'tor-github/pr/1291'
2019-09-05 17:09:20 +03:00
c29f05b159
Merge branch 'tor-github/pr/1292'
2019-09-05 17:06:58 +03:00
cdd7e88970
Merge branch 'tor-github/pr/1261'
2019-09-05 17:02:53 +03:00
be4a60945d
Check IPv6 exit policies on microdescriptors in node_exit_policy_rejects_all()
2019-09-05 17:02:45 +03:00
4b1d2ba979
changes: file for 30967
2019-09-05 11:15:30 +10:00
106b75aa53
changes file for 31532
2019-09-04 12:06:27 -04:00
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
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
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
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
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
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
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
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
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
78e084a12e
Merge branch 'tor-github/pr/1267'
2019-08-27 11:47:46 +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
cc5af6dbd5
Add changes file for Bug #31088
2019-08-26 20:02:11 -04:00
eff95429fd
Merge remote-tracking branch 'tor-github/pr/1241'
2019-08-26 10:15:25 -04:00
24bc2cd7b5
Merge branch 'tor-github/pr/1254'
2019-08-26 09:38:24 -04:00
38c4e1426c
changes file for ticket30935
2019-08-26 09:33:29 -04:00
7a45c9c1d2
Merge remote-tracking branch 'tor-github/pr/1215'
2019-08-24 16:30:55 -04:00
f1707f7db3
Merge branch 'maint-0.4.1'
2019-08-24 16:29:23 -04:00
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
41bc1fac8e
changes: file for 23507, v3 onion service fix
2019-08-23 16:25:33 +10:00
084245134b
changes: file for 23818, v3 onion service fix
2019-08-23 15:10:45 +10:00
14b5f40b54
Merge branch 'bug23818_029' into bug23818_035
2019-08-23 15:09:19 +10:00
231a74363f
changes: file for 23818, v2 onion service fix
2019-08-23 15:08:43 +10:00
d475d7c2fb
Merge branch 'tor-github/pr/1244'
2019-08-22 17:10:22 -04:00
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
7c92f4faa2
Merge branch 'bug31463_040' into bug31463_041
2019-08-22 22:10:06 +10:00
8b32d22a07
Merge branch 'bug31463_035' into bug31463_040
2019-08-22 22:10:00 +10:00
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
cc48eff2d3
Merge branch 'ticket31176' into ticket31176_merged
2019-08-21 09:46:20 -04:00
George Kadianakis
Neel Chauhan
teor
Nick Mathewson
David Goulet
rl1987
Sebastian Hahn