Nick Mathewson
a9db07f325
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-11-15 09:06:18 -05:00
teor
b8ce1de4bf
Appveyor: always show the logs, and upload them as build artifacts
...
Always show the configure and test logs, and upload them as build
artifacts, when building for Windows using Appveyor CI.
Implements 28459.
2018-11-15 21:04:17 +10:00
teor
27b9170475
Appveyor: add comments to the config file
...
Documentation for 28399, 28454, and previous fixes.
2018-11-15 19:23:41 +10:00
teor
83c1baca16
Appveyor: manually add zstd flags to configure
...
The mingw zstd from MSYS2 doesn't come with a pkg-config file.
Fixes 28454 on Tor 0.3.4.1-alpha.
2018-11-15 19:23:37 +10:00
teor
540c833f20
Appveyor: remove incorrect OpenSSL path
...
Fixes 28399 on 0.3.4.1-alpha.
2018-11-15 19:23:33 +10:00
teor
4c3d61b5f2
Appveyor: Improve diagnostics
...
Stop installing MSYS2 packages.
We're compiling for mingw, so we only need mingw packages.
Run pacman in verbose mode.
Explicitly install pkg-config and xz, to future-proof our builds.
Diagnostics for 28399.
2018-11-15 19:23:29 +10:00
teor
44ced9b750
Merge branch 'bug28096-029-squashed' into bug28096-035-squashed
...
Move the get_uname() changes from src/common/compat.c to
src/lib/osinfo/uname.c
2018-11-15 12:23:29 +10:00
teor
2fbc58cf07
Windows: fix uname on recent Windows versions
...
Correctly identify Windows 8.1, Windows 10, and Windows Server 2008
and later from their NT versions.
On recent Windows versions, the GetVersionEx() function may report
an earlier Windows version than the running OS. To avoid user
confusion, add "[or later]" to Tor's version string on affected
versions of Windows.
Remove Windows versions that were never supported by the
GetVersionEx() function.
Stop duplicating the latest Windows version in get_uname().
Fixes bug 28096; bugfix on 0.2.2.34; reported by Keifer Bly.
2018-11-15 12:19:11 +10:00
Nick Mathewson
eaff47352a
Make sure sandbox-related getaddrinfo() functions always exist.
2018-11-14 16:12:29 -05:00
Nick Mathewson
e420154ce7
Add an include to main.c
2018-11-14 16:07:36 -05:00
Nick Mathewson
6ca29ea409
Add libtor-buf-testing to build.rs
2018-11-14 16:07:36 -05:00
Nick Mathewson
5090fecaca
changes file for no-circular-dependencies stuff (28362)
2018-11-14 16:07:36 -05:00
Nick Mathewson
fae29f7b42
Make the topological-sort output off by default
2018-11-14 16:07:36 -05:00
Nick Mathewson
c3c8c926bf
Update the check-includes script to enforce some naming and no-circularity rules
2018-11-14 16:07:36 -05:00
Nick Mathewson
4ecd5da306
Add .may_include to ext/timeouts.
2018-11-14 16:07:36 -05:00
Nick Mathewson
d32795bb6e
Make "ext" participate in may_include.
...
Also, resolve a circular dependency involving the use of lib/log by
csiphash.c.
2018-11-14 16:07:36 -05:00
Nick Mathewson
e429e31ad1
Normalize .may_include to always have paths, and paths to include
2018-11-14 16:07:35 -05:00
Nick Mathewson
c0a7527eb8
Remove dependency on lib/net from lib/sandbox.
...
This was trivial, and the easiest way to remove the remaining
.may_include circularities.
2018-11-14 16:07:03 -05:00
Nick Mathewson
f6b8c7da66
Move buffers.c out of lib/containers to resolve a circularity.
2018-11-14 16:07:03 -05:00
Nick Mathewson
c9f9c9bc49
Make memarea use smartlist_core, not container.
2018-11-14 16:07:03 -05:00
Nick Mathewson
12175987fc
Merge branch 'maint-0.3.5'
2018-11-14 15:43:49 -05:00
Nick Mathewson
d598d834f5
Merge branch 'ticket27750_034_01_squashed' into maint-0.3.5
2018-11-14 15:43:46 -05:00
David Goulet
c99f220f78
conn: Close the read side of a closing connection when write limit is reached
...
In conn_close_if_marked(), we can decide to keep a connection open that still
has data to flush on the wire if it is being rate limited on the write side.
However, in this process, we were also looking at the read() side which can
still have token in its bucket and thus not stop the reading. This lead to a
BUG() introduced in 0.3.4.1-alpha that was expecting the read side to be
closed due to the rate limit but which only applies on the write side.
This commit removes any bandwidth check on the read side and simply stop the
read side on the connection regardless of the bucket state. If we keep the
connection open to flush it out before close, we should not read anything.
Fixes #27750
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-11-14 15:42:52 -05:00
Nick Mathewson
cec58ae55c
Merge branch 'maint-0.3.5'
2018-11-14 07:56:52 -05:00
Nick Mathewson
a58b19465d
Merge remote-tracking branch 'teor/bug28441-035' into maint-0.3.5
2018-11-14 07:56:48 -05:00
Nick Mathewson
1043532a51
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-14 07:55:07 -05:00
Nick Mathewson
3deb01e1a4
Merge branch 'maint-0.3.5'
2018-11-14 07:55:07 -05:00
Nick Mathewson
eba989bf0e
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-11-14 07:55:07 -05:00
Nick Mathewson
db3acb3aa3
Work around check-spaces.
2018-11-14 07:54:57 -05:00
Nick Mathewson
26fd7c1d9c
Changes file for bug 28419
2018-11-14 07:51:36 -05:00
Martin Kepplinger
7ba1f39116
libtorrunner: fix memory leak in child() error path
...
This avoids leaking memory in case libtorrunner's child() function fails.
2018-11-14 07:49:51 -05:00
Nick Mathewson
c7f09554eb
Merge branch 'maint-0.3.5'
2018-11-14 07:45:58 -05:00
Taylor Yu
763ccd0928
Fix Doxyfile for 0.3.5 source tree moves
...
Make Doxygen work again after the 0.3.5 source tree moves. Fixes bug
28435; bugfix on 0.3.5.1-alpha.
2018-11-14 07:45:55 -05:00
Nick Mathewson
586c3a7c90
Merge branch 'maint-0.3.5'
2018-11-14 07:42:56 -05:00
teor
16ca6fdfdb
log: stop talking about the Named flag in log messages
...
Clients have ignored the Named flag since 0.3.2.
Fixes bug 28441; bugfix on 0.3.2.1-alpha.
2018-11-14 18:16:34 +10:00
teor
9daf06d171
comment: circuit_list_path_impl() does not check Named any more
2018-11-14 18:06:14 +10:00
teor
a7aa3f76ec
comment: Fix a typo in nodes_in_same_family()
2018-11-14 18:06:05 +10:00
teor
c793cf338b
doc: Remove an outdated sentence from KeepalivePeriod in the man page
2018-11-14 18:05:56 +10:00
Nick Mathewson
a6a7a1f3ed
Merge branch 'maint-0.3.5'
2018-11-13 16:48:26 -05:00
Nick Mathewson
021187f915
Merge branch 'bug28183_029' into maint-0.3.5
2018-11-13 16:48:21 -05:00
David Goulet
342f2b1873
Merge branch 'tor-github/pr/501'
2018-11-13 10:48:23 -05:00
David Goulet
8fb318860e
Merge branch 'maint-0.3.5'
2018-11-13 10:43:03 -05:00
David Goulet
6f2151be9a
Merge branch 'tor-github/pr/487' into maint-0.3.5
2018-11-13 10:37:25 -05:00
Neel Chauhan
ec93385cb2
Comment for rend_cache_failure in feature/rend/rendcache.c: "usuable" should be "usable"
2018-11-13 10:33:51 -05:00
Nick Mathewson
42be1c668b
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-13 08:27:29 -05:00
Nick Mathewson
d000e798ac
Merge branch 'maint-0.3.5'
2018-11-13 08:27:29 -05:00
Nick Mathewson
ae4c94bb64
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-11-13 08:27:29 -05:00
Nick Mathewson
54d1a2d805
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-11-13 08:27:17 -05:00
Nick Mathewson
7f042cbc0a
Merge branch 'bug28413_029' into maint-0.2.9
2018-11-13 08:26:51 -05:00
Nick Mathewson
1a11702a9a
Fix a compiler warning in aes.c.
...
Apparently some freebsd compilers can't tell that 'c' will never
be used uninitialized.
Fixes bug 28413; bugfix on 0.2.9.3-alpha when we added support for
longer AES keys to this function.
2018-11-12 15:39:28 -05:00