34083f00ab
Merge branch 'maint-0.3.4'
2018-08-15 12:20:57 -04:00
571cb2f662
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-15 12:20:57 -04:00
0fc171a47b
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-15 12:20:57 -04:00
a26a2735b9
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-15 12:20:57 -04:00
4c355ff185
Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9
2018-08-15 12:20:53 -04:00
6c1d2549df
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-15 02:16:23 -04:00
1868982de6
Merge remote-tracking branch 'public/bug26779_033' into maint-0.3.3
2018-08-15 02:16:19 -04:00
b329cdf768
Merge remote-tracking branch 'public/bug26779_035'
2018-08-15 02:14:17 -04:00
57d0b8c3cd
Merge remote-tracking branch 'tor-github/pr/206'
2018-08-11 10:14:29 -04:00
c775689e96
Merge remote-tracking branch 'tor-github/pr/244'
2018-08-11 10:05:15 -04:00
61d5bcc1a2
Merge remote-tracking branch 'tor-github/pr/268'
2018-08-11 10:04:04 -04:00
b7ed61167f
Merge remote-tracking branch 'tor-github/pr/239'
2018-08-10 12:35:06 -04:00
5980cb8a19
Merge branch 'maint-0.3.4'
2018-08-09 08:47:26 -04:00
b4362b99cf
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-09 08:47:25 -04:00
fde551a387
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-09 08:47:25 -04:00
8982719f6a
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-09 08:47:24 -04:00
fe19b40fe9
Update geoip and geoip6 to the August 7 2018 database.
2018-08-09 09:44:38 +02:00
159141a8c6
Merge branch 'ticket26947'
2018-08-08 18:07:32 -04:00
0f0dac0bfc
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-08 18:06:15 -04:00
da4f4cb269
Merge branch 'maint-0.3.4'
2018-08-08 18:06:15 -04:00
c4d0d9bd24
Merge branch 'bug26948_033' into maint-0.3.3
2018-08-08 18:06:11 -04:00
26f1167e71
Merge branch 'bug26779_033' into bug26779_035
2018-08-08 15:50:29 -04:00
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
5f2e00241a
Add changes file
2018-08-08 19:07:50 +03:00
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
aaa5ca366e
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-08 09:26:23 -04:00
7787150521
Merge branch 'maint-0.3.4'
2018-08-08 09:26:23 -04:00
00536254b7
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-08 09:26:23 -04:00
8e68fe7e1c
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-08 09:26:22 -04:00
27a2a6cb9b
Changes file for 25440
2018-08-08 09:26:21 -04:00
8410d3b0ad
These changes files are also merged in 0.3.4.6-rc: remove them.
2018-08-07 08:10:26 -04:00
5e86a28683
Merge branch 'maint-0.3.4'
2018-08-07 08:05:56 -04:00
882b2ad0aa
Merge branch 'bug27003_034_v2' into maint-0.3.4
2018-08-07 08:05:51 -04:00
abf88af488
Merge branch 'maint-0.3.4'
2018-08-06 10:39:59 -04:00
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
2584604664
Remove changes files for items already merged into 0.3.4.6-rc
2018-08-06 08:35:41 -04:00
5597ddc360
Mark openbsd-malloc as deprecated
2018-08-03 07:38:47 -04:00
bb1f294232
Merge branch 'with_malloc_squashed'
2018-08-03 07:35:23 -04:00
abde9fb426
Add a --with-malloc option.
...
Based on a patch from Hello71 on ticket 20424.
This patch additionally fixes openbsd-malloc support, switches
our tcmalloc support to use pkgconfig, and tells the compiler to
omit system malloc implementations as appropriate.
squash! Add a --with-malloc option.
Edit changelog file to fix a typo and credit Alex Xu in preferred format.
2018-08-03 07:34:40 -04:00
2a6c1585b0
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-03 07:33:45 -04:00
4856a6e6c4
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-03 07:33:45 -04:00
be8e56c231
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-03 07:33:45 -04:00
ae157b79e7
Merge branch 'maint-0.3.4'
2018-08-03 07:33:45 -04:00
42c6ebda16
Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9
2018-08-03 07:33:39 -04:00
176999fd95
When enabling periodic events, schedule but don't run them immediately.
...
When we fixed 25939 in f7633c1fca#25761 ) prevented us from rescanning our periodic
events as appropriate, but when we fixed THAT one, this bug reared
its ugly head.
The fix here is that "enabling" an event should cause us to run it
from the event loop, but not immediately from the point where we
enable it.
Fixes bug 27003; bugfix on 0.3.4.1-alpha.
2018-08-02 10:14:56 -04:00
772106c6bc
Add a new function, tor_api_get_provider_version()
...
Closes ticket 26947.
2018-07-31 09:18:54 -04:00
7e4ac0283e
Merge remote-tracking branch 'teor/bug26986'
2018-07-31 08:50:38 -04:00
a67d153cc7
Always call tor_free_all() when exiting tor_run_main()
...
We would usually call it through tor_cleanup(), but in some code
paths, we wouldn't. These paths would break restart-in-process,
since leaving fields uncleared would cause assertion failures on
restart.
Fixes bug 26948; bugfix on 0.3.3.1-alpha
2018-07-31 08:45:17 -04:00
01c73711f1
Merge branch 'maint-0.3.4'
2018-07-31 08:30:58 -04:00
bcce3e7e0b
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-31 08:30:01 -04:00
Nick Mathewson
Karsten Loesing
rl1987