Nick Mathewson
d029a5162d
Merge branch 'ticket27096'
2018-08-16 08:32:06 -04:00
rl1987
fb137b30fc
Exclude setenv/unsetenv code on Windows
2018-08-16 08:31:45 -04:00
rl1987
f454c28303
Fix test to pass without HOME env being set
2018-08-16 08:31:45 -04:00
Nick Mathewson
34083f00ab
Merge branch 'maint-0.3.4'
2018-08-15 12:20:57 -04:00
Nick Mathewson
571cb2f662
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-15 12:20:57 -04:00
Nick Mathewson
0fc171a47b
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-15 12:20:57 -04:00
Nick Mathewson
a26a2735b9
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-15 12:20:57 -04:00
Nick Mathewson
4c355ff185
Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9
2018-08-15 12:20:53 -04:00
Nick Mathewson
075fcb599c
Merge branch 'maint-0.3.4'
2018-08-15 02:16:23 -04:00
Nick Mathewson
6c1d2549df
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-15 02:16:23 -04:00
Nick Mathewson
1868982de6
Merge remote-tracking branch 'public/bug26779_033' into maint-0.3.3
2018-08-15 02:16:19 -04:00
Nick Mathewson
b329cdf768
Merge remote-tracking branch 'public/bug26779_035'
2018-08-15 02:14:17 -04:00
Nick Mathewson
57d0b8c3cd
Merge remote-tracking branch 'tor-github/pr/206'
2018-08-11 10:14:29 -04:00
Nick Mathewson
c775689e96
Merge remote-tracking branch 'tor-github/pr/244'
2018-08-11 10:05:15 -04:00
Nick Mathewson
61d5bcc1a2
Merge remote-tracking branch 'tor-github/pr/268'
2018-08-11 10:04:04 -04:00
Nick Mathewson
b7ed61167f
Merge remote-tracking branch 'tor-github/pr/239'
2018-08-10 12:35:06 -04:00
Nick Mathewson
5980cb8a19
Merge branch 'maint-0.3.4'
2018-08-09 08:47:26 -04:00
Nick Mathewson
b4362b99cf
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-09 08:47:25 -04:00
Nick Mathewson
fde551a387
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-09 08:47:25 -04:00
Nick Mathewson
8982719f6a
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-09 08:47:24 -04:00
Karsten Loesing
fe19b40fe9
Update geoip and geoip6 to the August 7 2018 database.
2018-08-09 09:44:38 +02:00
Neel Chauhan
a207511bb0
In cell_queues_check_size(), add DNS cache size to total memory allocation
2018-08-08 20:52:57 -04:00
Nick Mathewson
df444e482b
Provide examples of tor_api_get_provider_version() output
...
At the same time, sternly warn any person thinking about relying on
any particular format too strictly. If you do this, and your
program breaks, it is your bug, not mine.
2018-08-08 18:10:28 -04:00
Nick Mathewson
159141a8c6
Merge branch 'ticket26947'
2018-08-08 18:07:32 -04:00
Nick Mathewson
0f0dac0bfc
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-08 18:06:15 -04:00
Nick Mathewson
da4f4cb269
Merge branch 'maint-0.3.4'
2018-08-08 18:06:15 -04:00
Nick Mathewson
c4d0d9bd24
Merge branch 'bug26948_033' into maint-0.3.3
2018-08-08 18:06:11 -04:00
Nick Mathewson
26f1167e71
Merge branch 'bug26779_033' into bug26779_035
2018-08-08 15:50:29 -04:00
Nick Mathewson
b66386865e
Detect broken stdatomic.h, and pretend that it isn't there at all
...
I hope that the debian clang maintainers will look at debian bug
903709 soon. But until they do, this should keep our users and our
CI happy on sid with clang.
Closes ticket 26779.
2018-08-08 15:49:39 -04:00
rl1987
5f2e00241a
Add changes file
2018-08-08 19:07:50 +03:00
rl1987
7a1007861f
Print stacktrace when crypto_pk_get_digest() fails in router_build_fresh_descriptor()
2018-08-08 18:56:27 +03:00
rl1987
9c242e950b
Consider all routerinfo errors other than "not a server" transient
2018-08-08 18:47:43 +03:00
Nick Mathewson
7a570b8182
Don't search for -lpthread on Windows
...
If we're building for Windows, we want to use windows threads no
matter what, and we don't want to link a pthread library even if it
is present. Fixes bug 27081; bugfix on 1790dc6760
2018-08-08 09:56:51 -04:00
Nick Mathewson
aaa5ca366e
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-08 09:26:23 -04:00
Nick Mathewson
7787150521
Merge branch 'maint-0.3.4'
2018-08-08 09:26:23 -04:00
Nick Mathewson
00536254b7
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-08 09:26:23 -04:00
Nick Mathewson
8e68fe7e1c
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-08 09:26:22 -04:00
Nick Mathewson
27a2a6cb9b
Changes file for 25440
2018-08-08 09:26:21 -04:00
Daniel Pinto
a350f216b3
Fix crash when calling openat with sandbox enabled #25440
...
The seccomp rule for the openat syscall checks for the AT_FDCWD
constant. Because this constant is usually a negative value, a
cast to unsigned int is necessary to make sure it does not get
converted to uint64_t used by seccomp.
More info on:
https://github.com/seccomp/libseccomp/issues/69#issuecomment-273805980
2018-08-08 09:21:29 -04:00
Neel Chauhan
3a2b5a5bcb
Fix typo in control_event_hs_descriptor_content()
2018-08-08 00:12:00 -04:00
Nick Mathewson
837f11a532
Merge branch 'maint-0.3.4'
...
"ours" merge to avoid version bump.
2018-08-07 20:15:50 -04:00
Nick Mathewson
de129e69ba
Update version to 0.3.4.6-rc-dev
2018-08-07 20:15:34 -04:00
Nick Mathewson
f537202196
Forward-port the 0.3.4.6-rc changelog
2018-08-07 20:09:35 -04:00
Nick Mathewson
8410d3b0ad
These changes files are also merged in 0.3.4.6-rc: remove them.
2018-08-07 08:10:26 -04:00
Nick Mathewson
5e86a28683
Merge branch 'maint-0.3.4'
2018-08-07 08:05:56 -04:00
Nick Mathewson
882b2ad0aa
Merge branch 'bug27003_034_v2' into maint-0.3.4
2018-08-07 08:05:51 -04:00
Nick Mathewson
abf88af488
Merge branch 'maint-0.3.4'
2018-08-06 10:39:59 -04:00
Nick Mathewson
a54e94878a
Rename SEC identifier to BW_SEC in test_bwmgt.h
...
Apparently Solaris 10 defines SEC somewhere in its headers, causing
a compilation problem.
Fixes bug 26994; bugfix on 0.3.4.1-alpha.
2018-08-06 10:39:14 -04:00
Nick Mathewson
2584604664
Remove changes files for items already merged into 0.3.4.6-rc
2018-08-06 08:35:41 -04:00
Nick Mathewson
c165cb7f57
Merge branch 'maint-0.3.4'
...
"ours" to avoid version bump.
2018-08-06 08:29:44 -04:00
