Nick Mathewson
11161395af
Merge branch 'maint-0.3.4'
2018-10-15 12:52:54 -04:00
Nick Mathewson
633e99575f
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-15 12:52:54 -04:00
Nick Mathewson
6b2ef2c559
Fix another tor_assert(0) case
2018-10-15 12:52:48 -04:00
Nick Mathewson
feed41bed3
Merge branch 'maint-0.3.4'
2018-10-15 12:47:46 -04:00
Nick Mathewson
d1ec7bb06e
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-15 12:47:46 -04:00
Nick Mathewson
86e0be421f
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-10-15 12:47:46 -04:00
Nick Mathewson
5b28190c67
Fix make check-spaces.
2018-10-15 12:47:19 -04:00
Nick Mathewson
23ce9a60fb
Merge branch 'maint-0.3.4'
2018-10-15 10:48:35 -04:00
Nick Mathewson
3462f8ed64
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-15 10:48:35 -04:00
Nick Mathewson
796e36e535
Adjust tor_assert_unreached()
...
This version of the macro makes it obvious to the compiler that
"tor_assert_unreached()" will always abort().
2018-10-15 10:46:26 -04:00
Nick Mathewson
4983322cc7
Merge branch 'maint-0.3.4'
2018-10-15 10:37:53 -04:00
Nick Mathewson
fd528a0884
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-15 10:37:52 -04:00
Nick Mathewson
dff7d3d00a
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-10-15 10:37:49 -04:00
Nick Mathewson
b113399658
Merge branch 'bug27709_029' into maint-0.2.9
2018-10-15 10:34:39 -04:00
Nick Mathewson
5e582c7ffa
Explain a bit more about branch prediction in the unit-test case
2018-10-15 10:16:34 -04:00
rl1987
89c4a3a0b6
Write a comment to explain may_need_rebind condition
2018-10-15 16:18:31 +03:00
rl1987
9bb00a74bc
Refrain from listener rebinding when address families differ
2018-10-15 16:18:31 +03:00
Nick Mathewson
df2b46d18c
Remove a double-newline and improve a comment
2018-10-14 15:33:39 -04:00
Nick Mathewson
2dccef0eb4
Merge branch 'bug27772_squashed'
2018-10-14 15:31:52 -04:00
Nick Mathewson
6925b61cfd
Fix various GCC LTO warnings in the unit tests.
2018-10-14 15:25:16 -04:00
Nick Mathewson
7c8f20ba44
In tor_tls_get_my_certs(), set cert ptrs even on failure
...
Nothing should ever look at them on failure, but in some cases,
the unit tests don't check for failure, and then GCC-LTO freaks out.
Fixes part of 27772.
2018-10-14 15:25:16 -04:00
Nick Mathewson
dddecee291
Initialize some locals in socks5 parsing code.
...
These confused GCC LTO, which thought they might be used
uninitialized. I'm pretty sure that as long as 'res' indicates
success, they will always be set to something, but let's unconfuse
the compiler in any case.
2018-10-14 15:25:16 -04:00
Nick Mathewson
370d9922a4
Use the correct function signatures in test_relaycell.c
...
This is now officially an antipattern: please let's never copy a
function declaration in two places again. That's what headers are
for.
2018-10-14 15:25:16 -04:00
Nick Mathewson
965549aa07
Use assertions so GCC LTO doesn't worry about TLS channel conversion
...
Part of #27772
2018-10-14 15:25:16 -04:00
Nick Mathewson
2c5c17510a
Merge remote-tracking branch 'tor-github/pr/402'
2018-10-14 15:20:39 -04:00
Taylor Yu
36ba506508
report origin of mystery core file
...
Report what program produced the mysterious core file that we
occasionally see on Travis CI during make distcheck. Closes ticket
28024.
2018-10-12 15:55:15 -05:00
Nick Mathewson
67351f6724
Merge remote-tracking branch 'tor-github/pr/380'
2018-10-12 11:39:37 -04:00
Nick Mathewson
ffaf180b7e
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-10 17:12:34 -04:00
Nick Mathewson
f7e93cf2e7
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-10-10 17:12:34 -04:00
Nick Mathewson
391756f262
Merge branch 'maint-0.3.4'
2018-10-10 17:12:34 -04:00
Nick Mathewson
717507e3bb
Merge remote-tracking branch 'tor-github/pr/392' into maint-0.2.9
2018-10-10 17:12:11 -04:00
Taylor Yu
bfab1dda2b
Merge branch 'bug27738-034-merged' into bug27738-master-merged
2018-10-10 15:17:47 -05:00
Taylor Yu
484b259604
Merge branch 'bug27738-033' into bug27738-034
2018-10-10 15:13:02 -05:00
Taylor Yu
cc10873dee
Merge remote-tracking branch 'teor/bug27738-032' into bug27738-033
2018-10-10 15:01:59 -05:00
Nick Mathewson
50ad2545cc
Merge branch 'maint-0.3.4'
2018-10-10 14:27:27 -04:00
Nick Mathewson
48182c147b
Merge branch 'appveyor_pacman_fixes_034' into maint-0.3.4
2018-10-10 14:27:24 -04:00
Nick Mathewson
267b8d16b1
Add timeval.h include to compat_pthreads.c for timeradd()
...
OpenSolaris apparently doesn't have timeradd(), so we added a
replacement, but we weren't including it here after the big
refactoring in 0.3.5.1-alpha.
Fixes bug 27963; bugfix on 0.3.5.1-alpha.
2018-10-10 12:19:56 -04:00
Nick Mathewson
a23c36ebcd
Merge branch 'maint-0.3.4'
2018-10-10 11:34:49 -04:00
Nick Mathewson
e5fe8b0e3a
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-10 11:34:49 -04:00
Nick Mathewson
b057623bed
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-10-10 11:34:48 -04:00
Karsten Loesing
119df9c1c0
Update geoip and geoip6 to the October 9 2018 database.
2018-10-10 17:26:41 +02:00
Nick Mathewson
d3d6c59557
Add sys/time.h include back to procmon.c
2018-10-10 11:26:38 -04:00
Nick Mathewson
c6b5b43d92
fixup! Changes file for apveyor changes
2018-10-10 11:10:29 -04:00
Nick Mathewson
8c0009a8de
Changes file for apveyor changes
2018-10-10 10:22:08 -04:00
Nick Mathewson
1b57bbba02
Appveyor: Don't try to install the mingw openssl package
...
This package conflicts with a preinstalled mingw openssl.
Fixes bug 27943. I think this was an appveyor change, not a Tor bug.
2018-10-10 10:22:08 -04:00
Nick Mathewson
c6d2990a73
Install only one of the two mingw architectures in appveyor
...
Closes ticket 27765
This commit also changes the appveyor file to a unified line ending
style, since the old one was pretty confused. Use "-b" to see the
real differences.
2018-10-10 10:21:26 -04:00
Nick Mathewson
da86a70bd8
Merge remote-tracking branch 'tor-github/pr/384'
2018-10-10 09:24:48 -04:00
Nick Mathewson
7409aa58d1
Merge remote-tracking branch 'tor-github/pr/385'
2018-10-09 12:46:46 -04:00
Nick Mathewson
361eaa9931
Merge remote-tracking branch 'public/ticket27856'
2018-10-09 09:04:53 -04:00
rl1987
fb1d37f34f
Add changes file
2018-10-07 18:28:04 +03:00
