7a7685955e
Merge remote-tracking branch 'tlyu-github/bug28929'
2019-01-07 08:46:27 -05:00
85c5f58509
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-07 08:43:46 -05:00
fe26e1f1c8
Merge branch 'maint-0.3.5'
2019-01-07 08:43:46 -05:00
3d18903f53
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-07 08:43:45 -05:00
ba71b17865
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-01-07 08:43:45 -05:00
445d6750f7
Update geoip and geoip6 to the January 3 2019 database.
2019-01-07 09:00:29 +01:00
41e3c760a4
Fix a warning in test_process.c on 32-bit platforms with clang.
...
Bug not in any released Tor.
2019-01-04 18:39:22 -05:00
7e75311714
Fix typo in bootstrap message
...
The message for the "ap_conn_proxy" bootstrap status tag was missing
some text. Fixes bug 28929. Bug not in any released Tor.
2019-01-04 17:27:28 -06:00
74bda3079c
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-04 15:04:58 -05:00
d7259b64d4
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-04 15:04:58 -05:00
fee2eaf2d4
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-01-04 15:04:58 -05:00
c5a216fe1b
Merge branch 'maint-0.3.5'
2019-01-04 15:04:58 -05:00
73de7b4bcb
Merge branch 'bug21394_029_redux' into maint-0.2.9
2019-01-04 15:04:54 -05:00
af85a0f28f
Remove from master those changes files that will appear in 0.3.5.7 or earlier.
2019-01-04 15:04:00 -05:00
16deb1f5f2
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-04 14:57:06 -05:00
fe3331b845
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-04 14:57:06 -05:00
a9c7830982
Merge branch 'maint-0.3.5'
2019-01-04 14:57:06 -05:00
bf8bb9c526
Merge remote-tracking branch 'dgoulet/ticket28619_033_01' into maint-0.3.3
2019-01-04 14:49:16 -05:00
fa05efdf8b
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-04 14:36:02 -05:00
94cab0d0bb
Merge branch 'maint-0.3.5'
2019-01-04 14:36:02 -05:00
d47c9276de
Merge branch 'ticket27750_034_01_squashed' into maint-0.3.4
2019-01-04 14:34:38 -05:00
98a1b8770c
Merge branch 'maint-0.3.5'
2019-01-03 21:34:43 -05:00
c75cf802d3
Merge branch 'ticket28879' into maint-0.3.5
2019-01-03 21:34:35 -05:00
7232f04939
Merge branch 'ticket28880'
2019-01-03 21:33:40 -05:00
a7cbbf279e
Merge branch 'ticket28852'
2019-01-03 21:31:08 -05:00
4e4f93d364
Add a #ifdef HAVE_UNISTD_H check to buffers.c
...
Reported on tor-dev by Gisle Vanem. Bug not in any released Tor
(The suggested patch used _MSC_VER, but that's not how we do stuff
with autoconf. With autoconf, you detect the feature you want,
rather than trying to list all the systems that do or do not have
it.)
2019-01-03 09:52:19 -05:00
9ba690e33f
Merge branch 'maint-0.3.5'
2019-01-03 09:45:56 -05:00
abdc6aede2
Merge branch 'ticket28851_035_squashed' into maint-0.3.5
2019-01-03 09:45:53 -05:00
b82717b273
Stop re-checking our hardcoded dh parameters on every startup
...
Closes ticket 28851.
2019-01-03 09:45:43 -05:00
47176eb678
Merge branch 'maint-0.3.5'
2019-01-03 09:44:15 -05:00
98736cf36a
Merge remote-tracking branch 'public/ticket28838_035' into maint-0.3.5
2019-01-03 09:44:10 -05:00
27853938a1
Merge branch 'maint-0.3.5'
2019-01-03 09:02:40 -05:00
3e64553f76
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-03 09:02:39 -05:00
ed62f0fa15
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-03 09:02:39 -05:00
1ea3127188
Merge branch 'ticket28973_033_squashed' into maint-0.3.3
2019-01-03 09:01:40 -05:00
bf413829cb
Detect openssl bug 7712 and work around it.
...
In theory it would be better to detect this bug in advance, but this
approach is much simpler, and therefore safer to backport.
This closes tor issue 28973.
2019-01-03 09:00:47 -05:00
dbf1725a13
Completely remove 'GETINFO status/version/num-{concurring,versioning}'
2019-01-03 10:36:38 +02:00
3e7f13a4ef
Merge branch 'maint-0.3.5'
2019-01-02 16:15:39 -05:00
98755cbddf
Merge branch 'bug28974_035' into maint-0.3.5
2019-01-02 16:15:34 -05:00
eaaeaf7933
Merge branch 'maint-0.3.5'
2019-01-02 16:09:20 -05:00
a4b86421d2
ticket 28924 deserves a changes file. I made one, but I guess I forgot to git add
2019-01-02 16:09:10 -05:00
968235ce6f
Explicitly ignore check_result() result in test_voting_flags_minimal
...
Otherwise, coverity complains at is.
2019-01-02 15:45:52 -05:00
b33bcb1e63
Add an errno.h include to freespace.c to fix bug 28974.
2019-01-02 15:19:52 -05:00
0658c729cf
Add TODO file for padding work.
...
Note to self/others: don't merge this.
Co-authored-by: George Kadianakis <desnacked@riseup.net >
2019-01-02 15:25:55 +02:00
56a45eb409
Disable current padding machines.
...
Co-authored-by: Mike Perry <mikeperry-git@torproject.org >
2019-01-02 15:25:55 +02:00
926fc93be5
Concentrate all TOR_USEC_PER_SEC definitions in a single header file.
...
Co-authored-by: Mike Perry <mikeperry-git@torproject.org >
2019-01-02 15:25:55 +02:00
dd04917851
Use the new probability distribution code in WTF-PAD.
...
Co-authored-by: Mike Perry <mikeperry-git@torproject.org >
Co-authored-by: Taylor R Campbell <campbell+tor@mumble.net >
2019-01-02 15:25:55 +02:00
2ccf326837
Implement and test probability distributions used by WTF-PAD.
...
This project introduces the prob_distr.c subsystem which implements all the
probability distributions that WTF-PAD needs. It also adds unittests for all of
them.
Code and tests courtesy of Riastradh.
Co-authored-by: Taylor R Campbell <campbell+tor@mumble.net >
Co-authored-by: Mike Perry <mikeperry-git@torproject.org >
2019-01-02 15:25:55 +02:00
8ad497bb57
Config option to specify specific MiddleNodes.
...
Hope is this will make it easier to test on the live tor network.
Does not need to be merged if we don't want to, but will come in handy
for researchers.
Co-authored-by: George Kadianakis <desnacked@riseup.net >
2019-01-02 15:25:55 +02:00
a336d816a6
Circuit padding tests.
...
Co-authored-by: George Kadianakis <desnacked@riseup.net >
2019-01-02 15:25:55 +02:00
Nick Mathewson
Karsten Loesing
Taylor Yu
rl1987
Mike Perry
George Kadianakis