summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-08-29On windows, allow many entries in conscache directoriesNick Mathewson
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-29On windows, don't force-unlink active conscache objects.Nick Mathewson
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-29Merge remote-tracking branch 'dgoulet/bug22159_031_01' into maint-0.3.1Nick Mathewson
2017-08-29Add test_hs_descriptor.inc to include.am to unbreak distcheck.Nick Mathewson
2017-08-28hs: Fix the intro circuit max retryDavid Goulet
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-28Merge branch 'ticket22348_031' into maint-0.3.1Nick Mathewson
2017-08-28Try to improve the keypinning-failure message even moreNick Mathewson
2017-08-25Merge branch 'bug19418_029' into maint-0.3.1Nick Mathewson
2017-08-21Merge branch 'bug23291_028' into maint-0.3.1Nick Mathewson
2017-08-21changes file for bug 23291Nick Mathewson
2017-08-2122839: fix check_heap_buffer buffer size in test-memwipeTies Stuij
2017-08-21whitespace fixesNick Mathewson
2017-08-21Fix triggerable BUG() when decoding hsv3 descriptors.George Kadianakis
Also improve the unittest to make sure it catches the right error.
2017-08-21Add unittest for #23233.George Kadianakis
This will fail currently since the bug is not fixed yet.
2017-08-09Make sure we always wind up checking i2d_*'s output.Nick Mathewson
The biggest offender here was sometimes not checking the output of crypto_pk_get_digest. Fixes bug 19418. Reported by Guido Vranken.
2017-08-08Use a single free-and-exit strategy in config_process_include.Nick Mathewson
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-08Merge branch 'bug23139' into maint-0.3.1Nick Mathewson
2017-08-08chages file on 22286Nick Mathewson
2017-08-08Remove some LCOV_EXCL stuff that I think may be testable after all.Nick Mathewson
This is partial revert on 22286. Also, tweak some log messages to be distinct.
2017-08-08Merge remote-tracking branch 'ahf/bugs/22286' into maint-0.3.1Nick Mathewson
2017-08-08Fix a memory leak in consdiffmgr.cNick Mathewson
Fixes bug 23139; bugfix on 0.3.1.1-alpha.
2017-08-03Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-08-03Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0Nick Mathewson
2017-08-03Merge branch 'bug23081_025' into maint-0.3.1Nick Mathewson
2017-08-03In ntmain, call set_main_thread() before running the loop.Nick Mathewson
Patch from Vort; fixes bug 23081; bugfix on fd992deeea76972 in 0.2.1.16-rc when set_main_thread() was introduced. See the changes file for a list of all the symptoms this bug has been causing when running Tor as a Windows Service.
2017-08-03Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson
2017-08-03Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-08-03Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-08-03Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-08-03Update geoip and geoip6 to the August 3 2017 database.Karsten Loesing
2017-08-02Merge branch 'bug23071_031' into maint-0.3.1Nick Mathewson
2017-08-02Make the hs_ntor_ref logic more correct when there is no sha3 moduleNick Mathewson
2017-08-02Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
"ours" merge to avoid version bump.
2017-08-02version bump to 0.3.0.10-devNick Mathewson
2017-08-01Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
"Ours merge" to avoid version bump.
2017-08-01Bump to 0.3.0.10Nick Mathewson
2017-08-01hs: Cleanup logging statement in hs_intropoint.cDavid Goulet
One log statement was a warning and has been forgotten. It is triggered for a successful attempt at introducting from a client. It has been reported here: https://lists.torproject.org/pipermail/tor-relays/2017-August/012689.html Three other log_warn() statement changed to protocol warning because they are errors that basically can come from the network and thus triggered by anyone. Fixes #23078. Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-08-01bump to 0.3.1.5-alpha-devNick Mathewson
2017-08-01Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-08-01Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-08-01Merge remote-tracking branch 'public/bug19769_19025_029' into maint-0.2.9Nick Mathewson
2017-08-01Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-08-01Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-08-01Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9Nick Mathewson
2017-08-01Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-08-01Merge remote-tracking branch 'public/bug20270_029' into maint-0.3.0Nick Mathewson
2017-08-01Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-08-01Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-08-01Merge remote-tracking branch 'public/bug22245_024' into maint-0.2.9Nick Mathewson
2017-08-01Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson