Mike Perry
6d221c8f37
Ticket #17857 : Apply padding off-switch to existing connections.
2017-09-12 10:28:45 -04:00
Nick Mathewson
469189d84a
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid torgzip.c change, since torgzip has been replaced.
2017-09-12 09:24:20 -04:00
Nick Mathewson
0729ba2868
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-12 09:23:57 -04:00
Nick Mathewson
bac160b4e0
One more implicit fallthrough warning to fix on GCC 7
2017-09-12 09:22:50 -04:00
Nick Mathewson
eaa8224cef
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-11 17:49:18 -04:00
Nick Mathewson
2b26815e09
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-11 17:49:18 -04:00
Andreas Stieger
6cd5a80275
Fix GCC 7 -Wimplicit-fallthrough warnings
...
Add magic comments recognized by default -Wimplicit-fallthrough=3
or break, as required.
2017-09-11 17:47:04 -04:00
Andreas Stieger
b81a2e8f46
Fix GCC 7 -Wimplicit-fallthrough warnings (32 bit)
...
Add magic comments recognized by default -Wimplicit-fallthrough=3
Follow-up to e5f464, fixes Ticket 22446 for 32 bit.
[nick notes: Backport from 0.3.1.3-alpha.]
2017-09-11 17:45:07 -04:00
Nick Mathewson
d4f87073ae
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-11 16:29:10 -04:00
Nick Mathewson
c894e9d3d4
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-11 16:29:10 -04:00
Nick Mathewson
6a49e3360b
Fix mixed-sign comparison warning in fix for 22797.
2017-09-11 16:29:06 -04:00
Nick Mathewson
a25d97e530
Merge branch 'teor-bug22797-025' into maint-0.2.9
2017-09-11 16:28:59 -04:00
Nick Mathewson
72ea4a8f08
Extract the important parts of the run-pending-timers function.
...
Our unit tests will need this, so that they can simulate advancing
time without getting libevent involved.
2017-09-11 13:48:39 -04:00
Nick Mathewson
f5092e711f
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-08 08:24:47 -04:00
Nick Mathewson
7a83cf75dc
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-08 08:24:47 -04:00
Nick Mathewson
3cace828a9
Merge branch 'bug22644_029' into maint-0.2.9
2017-09-08 08:24:36 -04:00
Nick Mathewson
a9d4df9a08
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-07 15:18:01 -04:00
Nick Mathewson
54fb1d0f7f
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-07 15:18:01 -04:00
Nick Mathewson
bcf2b413c3
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-09-07 15:18:00 -04:00
Nick Mathewson
08592c95fa
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-09-07 15:18:00 -04:00
Karsten Loesing
09618ffe38
Update geoip and geoip6 to the September 6 2017 database.
2017-09-07 21:06:16 +02:00
Nick Mathewson
12dad5ebf7
Fix crashes on empty +HSPOST and +POSTDESCRIPTOR commands
...
Fixes bug 22644; bugfix on 0.2.7.1-alpha and 0.2.0.1-alpha
respectively.
2017-09-07 09:20:00 -04:00
Nick Mathewson
9c404602a0
Add a stack trace to the warning at issue with 23105.
...
With luck, this will help us diagnose 23105 and fix it.
I also added a stack trace to the warning right before it, since why
not.
2017-09-07 08:49:11 -04:00
Nick Mathewson
fd0a894d28
Bump to 0.3.1.6-rc-dev
2017-09-05 10:20:34 -04:00
David Goulet
7eaf055b28
test: Fix memory leak in hs_descriptor/decode_bad_signature
...
Fixes #23319
Cherry-picked from master; bug not in any released Tor.
2017-09-05 09:26:21 -04:00
Nick Mathewson
2d55620a9e
Bump version to 0.3.1.6-rc
2017-09-05 08:30:52 -04:00
Nick Mathewson
4d97efd4d1
Merge branch 'bug22752_031_simple' into maint-0.3.1
2017-09-04 15:48:01 -04:00
Nick Mathewson
948be49ce0
22752: Improve comments to explain why we're doing this fix.
...
Based on questions and comments from dgoulet, I've tried to fill
in the reasoning about why these functions work in the way that they
do, so that it will be easier for future programmers to understand
why this code exists and works the way it does.
2017-09-04 11:54:49 -04:00
Nick Mathewson
a7aeb6f58f
Merge remote-tracking branch 'public/bug23275_031' into maint-0.3.1
2017-09-04 11:39:28 -04:00
Nick Mathewson
a58a41c15a
Changes file for bug22752 (simple version)
2017-08-29 13:09:39 -04:00
Nick Mathewson
da159c45e2
On windows, allow many entries in conscache directories
...
Since we can't be sure that we can unlink enough files on windows
here, let's let the number of permitted entries grow huge if it
really must.
We do this by letting the storagedir hold lots of entries, but still
trying to keep the number of entries under the configured limit. We
also have to tell consdiffmgr not to freak out if it can't actually
remove enough entries.
Part of a fix for bug 22752
2017-08-29 13:03:36 -04:00
Nick Mathewson
5e97b34daa
On windows, don't force-unlink active conscache objects.
...
Part of a fix for bug 22752: We can't unlink these because Windows
doesn't allow you to unlink an in-use file.
2017-08-29 13:02:02 -04:00
Nick Mathewson
6307a759ed
Merge remote-tracking branch 'dgoulet/bug22159_031_01' into maint-0.3.1
2017-08-29 11:11:09 -04:00
Nick Mathewson
5e08cf350b
Add test_hs_descriptor.inc to include.am to unbreak distcheck.
2017-08-29 10:57:13 -04:00
David Goulet
6507ecb7e8
hs: Fix the intro circuit max retry
...
Some parentheses were missing making the rend_max_intro_circs_per_period()
return a lower value than it was suppose to.
The calculation is that a service at most will open a number of intro points
that it wants which is 3 by default or HiddenServiceNumIntroductionPoints. Two
extra are launched for performance reason. Finally, this can happen twice for
two descriptors for the current and next time period.
From:
2 * n_intro_wanted + 2
...which resulted in 8 for 3 intro points, this commit fixes it to:
(n_intro_wanted + 2) * 2
... resulting in 12 possible intro point circuit which is the correct maximum
intro circuit allowed per period.
Last, this commit rate limits the the log message if we ever go above that
limit else over a INTRO_CIRC_RETRY_PERIOD, we can print it often!
Fixes #22159
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-08-28 14:43:42 -04:00
Nick Mathewson
63fc23f826
Merge branch 'ticket22348_031' into maint-0.3.1
2017-08-28 11:44:18 -04:00
Nick Mathewson
ab166fe68f
Try to improve the keypinning-failure message even more
2017-08-28 11:35:30 -04:00
Nick Mathewson
6069c829f9
Merge branch 'bug19418_029' into maint-0.3.1
2017-08-25 11:38:24 -04:00
Nick Mathewson
86ee35ad5b
Don't do expensive consensus stuff when not a cache.
...
This includes generating and storing compressed consensuses, and
consensus diffs. Fixes bug 23275; bugfix on 0.3.1.1-alpha.
2017-08-23 10:22:51 -04:00
Nick Mathewson
10b2428224
Merge branch 'bug23291_028' into maint-0.3.1
2017-08-21 15:06:39 -04:00
Nick Mathewson
b943cedf34
changes file for bug 23291
2017-08-21 15:04:35 -04:00
Ties Stuij
7ba873ca2d
22839: fix check_heap_buffer buffer size in test-memwipe
2017-08-21 15:03:54 -04:00
Nick Mathewson
6be0e28670
whitespace fixes
2017-08-21 14:18:41 -04:00
George Kadianakis
1491c0d024
Fix triggerable BUG() when decoding hsv3 descriptors.
...
Also improve the unittest to make sure it catches the right error.
2017-08-21 19:16:45 +03:00
George Kadianakis
45732a1a13
Add unittest for #23233 .
...
This will fail currently since the bug is not fixed yet.
2017-08-21 19:16:30 +03:00
Nick Mathewson
418f3d6298
Make sure we always wind up checking i2d_*'s output.
...
The biggest offender here was sometimes not checking the output of
crypto_pk_get_digest.
Fixes bug 19418. Reported by Guido Vranken.
2017-08-09 09:24:16 -04:00
Nick Mathewson
72832086e2
Use a single free-and-exit strategy in config_process_include.
...
This avoids a double-free when a pointer already freed with
tor_free(config_line) is freed again in the cleanup-and-exit code.
Fixes bug 23155.
2017-08-08 20:08:43 -04:00
Nick Mathewson
a47b8fcf92
Merge branch 'bug23139' into maint-0.3.1
2017-08-08 19:29:05 -04:00
Nick Mathewson
5368eaf62b
chages file on 22286
2017-08-08 10:09:54 -04:00
Nick Mathewson
7465ea4ad9
Remove some LCOV_EXCL stuff that I think may be testable after all.
...
This is partial revert on 22286.
Also, tweak some log messages to be distinct.
2017-08-08 10:08:06 -04:00
