Nick Mathewson
3405a311da
Merge branch 'maint-0.4.1'
2019-06-11 10:17:18 -04:00
Nick Mathewson
ce89fe36c8
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-06-11 10:17:18 -04:00
Nick Mathewson
b0fa1f4fb0
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-06-11 10:17:17 -04:00
Karsten Loesing
0ec4ebd00d
Update geoip and geoip6 to the June 10 2019 database.
2019-06-11 16:12:50 +02:00
Nick Mathewson
eb02c323eb
Merge branch 'maint-0.4.1'
2019-06-11 08:41:55 -04:00
Nick Mathewson
29842f68e7
Merge remote-tracking branch 'tor-github/pr/1082' into maint-0.4.1
2019-06-11 08:41:48 -04:00
George Kadianakis
a7986755ee
Merge branch 'tor-github/pr/1060'
2019-06-11 14:12:22 +03:00
George Kadianakis
e5ad6fb092
Merge branch 'ticket30769_041_01'
2019-06-11 14:11:24 +03:00
David Goulet
c1359b32a4
trunnel: Rename sendme.trunnel to sendme_cell.trunnel
...
This is to avoid having two sendme.{c|h} in the repository since the subsystem
is implemented in src/core/or/sendme.{c|h}.
Fixes #30769
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-11 14:11:10 +03:00
George Kadianakis
646f7a9a94
Merge branch 'ticket30687_042_01'
2019-06-11 14:02:33 +03:00
David Goulet
7cf9d54e6d
token-bucket: Implement a single counter object
...
Closes #30687 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-11 14:02:22 +03:00
George Kadianakis
b83dba7cb0
Merge branch 'maint-0.4.1'
2019-06-11 13:48:16 +03:00
George Kadianakis
eab9dc06af
Merge branch 'tor-github/pr/1065' into maint-0.4.1
2019-06-11 13:48:10 +03:00
George Kadianakis
ece5133e0d
Merge branch 'tor-github/pr/1098'
2019-06-11 13:19:43 +03:00
teor
bff42c86cd
changes: file for 30799
...
Note that this memory leak is in unreachable code.
2019-06-11 15:15:19 +10:00
Xiaoyin Liu
024d65e14e
Free a string buffer in nt_service_install()
...
The string buffer "command" is not freed if the specified account
name doesn't exist. This patch fixes this bug.
2019-06-11 15:12:20 +10:00
teor
e9f1e975df
Merge branch 'maint-0.4.1'
2019-06-11 14:52:40 +10:00
teor
2779ce1f6f
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-06-11 14:52:36 +10:00
teor
4ca18fde93
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-06-11 14:52:27 +10:00
teor
dcb8cad4e6
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5
2019-06-11 14:51:46 +10:00
teor
a742a80eea
Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5
2019-06-11 14:51:37 +10:00
teor
202ccc3930
Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5
2019-06-11 14:48:52 +10:00
teor
a58c4cc6dd
Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5
2019-06-11 14:47:40 +10:00
teor
cb20054ccd
Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5
2019-06-11 14:46:24 +10:00
teor
396134188f
Stop hard-coding env vars in the git scripts
...
Set the env vars:
* TOR_MASTER_NAME to override the tor master branch name, and
* TOR_WKT_NAME to override the worktree path
Fixes bug 30841; bugfix on 0.4.0.1-alpha.
2019-06-11 14:34:44 +10:00
teor
973800b847
scripts/git: Stop hard-coding the bash path in the git scripts
...
Some OSes don't have bash in /usr/bin, others have an ancient bash at
this path.
Fixes bug 30840; bugfix on 0.4.0.1-alpha.
2019-06-11 14:29:10 +10:00
Nick Mathewson
cfa943f140
Merge branch 'maint-0.4.1'
2019-06-10 18:44:31 -04:00
Nick Mathewson
5b07ff4011
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-06-10 18:44:31 -04:00
Nick Mathewson
c8447f95ec
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0
2019-06-10 18:44:20 -04:00
Nick Mathewson
d6b411a351
Merge branch 'maint-0.4.1'
2019-06-10 18:33:26 -04:00
Nick Mathewson
6a72cc2598
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-06-10 18:33:26 -04:00
Nick Mathewson
c8e09dd0d2
Merge branch 'maint-0.4.1'
2019-06-10 18:31:36 -04:00
Nick Mathewson
c0285320df
Merge remote-tracking branch 'tor-github/pr/1097' into maint-0.4.1
2019-06-10 18:31:23 -04:00
Nick Mathewson
df8e2bbc0f
Merge remote-tracking branch 'tor-github/pr/1038'
2019-06-10 09:38:40 -04:00
Nick Mathewson
1190636f24
Merge branch 'maint-0.4.1'
2019-06-10 09:37:28 -04:00
Nick Mathewson
765e4364d9
Merge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1
2019-06-10 09:37:17 -04:00
Nick Mathewson
0635170cf1
Add an environment variable to set GIT_PATH in git scripts
2019-06-10 09:05:26 -04:00
Nick Mathewson
bbddda3a18
push-all: Use TOR_UPSTREAM_REMOTE_NAME to override UPSTREAM_BRANCH
...
We already allow this override in our pre-push hook, so let's allow
it here too.
(I call my upstream branches "origin")
2019-06-10 09:01:17 -04:00
Nick Mathewson
46da530431
Update git scripts for new versions
...
{maint,release}-0.4.1 are now real
{maint,release}-0.3.4 are now EOL
Closes ticket 30822
2019-06-10 09:01:17 -04:00
Nick Mathewson
adc7b50eae
Bump master to 0.4.2.0-alpha-dev
2019-06-10 08:47:33 -04:00
teor
b9041e8a63
test: fix a typo in test_rebind.sh
...
Closes 30821.
2019-06-10 20:56:40 +10:00
teor
430dd2da6e
Merge branch 'bug30713_035' into bug30713_040
2019-06-10 20:50:53 +10:00
teor
be0a4be276
Travis: Skip test_rebind on macOS builds
...
Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental variable
is set.
Skip test_rebind on macOS in Travis builds, because it is unreliable
on macOS on Travis.
Fixes bug 30713; bugfix on 0.3.5.1-alpha.
2019-06-10 20:49:59 +10:00
teor
d761c3ca6d
Travis: allow the test-stem job to fail
...
Allow the test-stem job to fail in Travis, because it sometimes hangs.
Fixes bug 30744; bugfix on 0.3.5.4-alpha.
2019-06-10 19:18:35 +10:00
Nick Mathewson
c46e99c43c
Tolerate net-unreachable failures in util/socketpair_ersatz
...
This can happen when we have no network stack configured. Fixes bug
30804; bugfix on 0.2.5.1-alpha.
2019-06-07 13:52:03 -04:00
Nick Mathewson
ecc5feff38
bump to 0.4.1.2-alpha-dev
2019-06-06 08:28:34 -04:00
teor
6be9d3aed8
practracker: accept one extra line in routerlist.c
...
practracker exception for 30780.
2019-06-06 18:24:17 +10:00
teor
19bf5806ad
dirauth: Return a distinct status when formatting annotations fails
...
Adds ROUTER_AUTHDIR_BUG_ANNOTATIONS to was_router_added_t.
The out-of-order numbering is deliberate: it will be fixed by later commits
for 16564.
Fixes bug 30780; bugfix on 0.2.0.8-alpha.
2019-06-06 17:26:23 +10:00
teor
a4ea335a69
dirauth: Fix some comments in the router status processing code.
...
Fixes comments in dirserv_router_get_status() and was_router_added_t.
Preparation for 30780 and 16564.
2019-06-06 17:26:23 +10:00
teor
b07b1a4f6d
practracker: accept 3 extra lines in router_parse_entry_from_string()
...
practracker exception for bug 30781.
2019-06-06 13:42:30 +10:00
