Daniel Pinto
ba3a5f82f1
Add support for %include funcionality on torrc #1922
...
config_get_lines is now split into two functions:
- config_get_lines which is the same as before we had %include
- config_get_lines_include which actually processes %include
2017-05-18 23:44:16 +01:00
Nick Mathewson
e507751b9b
Merge branch 'maint-0.3.0'
...
"ours" to avoid version bump
2017-05-18 12:28:48 -04:00
Nick Mathewson
d1340bd5ac
bump to 0.3.0.7-dev
2017-05-18 12:28:28 -04:00
Nick Mathewson
b214c2c095
Merge branch 'maint-0.3.0'
2017-05-18 10:06:27 -04:00
Nick Mathewson
935cd77f62
Merge branch 'bug22252_029' into maint-0.3.0
2017-05-18 10:06:06 -04:00
Alexander Færøy
fcf836d239
Add coverage markers in Zstd + LZMA compression backends.
...
See: https://bugs.torproject.org/22286
2017-05-17 13:23:54 +00:00
Alexander Færøy
77511aed6c
Fix whitespace issue.
...
See: https://bugs.torproject.org/22286
2017-05-17 13:23:46 +00:00
Alexander Færøy
d74467e858
Check that tor_compress_state_size() returns a value larger than zero.
...
See: https://bugs.torproject.org/22286
2017-05-17 13:23:33 +00:00
Daniel Pinto
e04da2828d
Fixed error on BASEXX_NOPAD LEN and BUFSIZE macros #21872
2017-05-17 00:22:11 +01:00
Alexander Færøy
3772fdf756
Ensure that each compression backend returns a provider version identifier.
2017-05-16 19:08:18 +00:00
Nick Mathewson
2ba58f275c
Fix crash when starting with LearnCircuitBuildTimeout 0.
...
Before we've set our options, we can neither call get_options() nor
networkstatus_get_latest_consensus().
Fixes bug 22252; bugfix on 4d9d2553ba
in 0.2.9.3-alpha.
2017-05-16 11:20:12 -04:00
Nick Mathewson
bbeba2412e
Fix resource leak in parse_consensus_request()
...
We were allocating diff_hash_in_url on some URLs, but not freeing it.
Fixes CID 1409669. Bug not in any released Tor.
2017-05-16 10:47:41 -04:00
Nick Mathewson
2ca827104d
Report deleted consensuses as NOT_FOUND rather than AVAILABLE
...
This bug happened because of a bogus pointer check in
consdiffmgr_find_consensus(), not in any released Tor.
Fixes CID 1409670. Good catch, Coverity!
2017-05-16 10:44:24 -04:00
Nick Mathewson
222534d354
Fix remaining (non-false-positive) lintchanges complaints
2017-05-16 10:32:00 -04:00
Nick Mathewson
d29f494ec2
Merge branch 'maint-0.3.0'
2017-05-16 08:39:36 -04:00
Nick Mathewson
492f8a7c44
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-05-16 08:39:22 -04:00
Nick Mathewson
a7bcab2639
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-05-16 08:38:59 -04:00
Nick Mathewson
7bb2cd0c8e
Merge remote-tracking branch 'teor/fallback-inputs'
2017-05-16 08:35:02 -04:00
Nick Mathewson
bdac1a431f
Merge remote-tracking branch 'teor/fallback-usage'
2017-05-16 08:32:54 -04:00
Nick Mathewson
74e7be1c25
fill in a few more blanks in the changes files
2017-05-16 08:10:39 -04:00
teor
5b45d73293
Update fallback directory mirrors in May 2017
...
Replace the 177 fallbacks originally introduced in Tor 0.2.9.8 in
December 2016 (of which ~126 were still functional), with a list of
151 fallbacks (32 new, 119 existing, 58 removed) generated in May 2017.
Resolves ticket 21564.
2017-05-16 19:02:42 +10:00
teor
09cd788869
Update fallback whitelist and blacklist based on operator emails
...
Part of 21283.
2017-05-16 18:12:47 +10:00
teor
cd687a0a2c
Update fallback stability requirements
...
Decrease the minimum number of fallbacks to 100.
Final fix to 20913.
2017-05-16 18:12:10 +10:00
teor
0e81e2114a
Merge branch 'fallbacks-201702-v3' into fallbacks-2017-05
2017-05-16 18:03:00 +10:00
teor
3f28824931
Make the usage example in updateFallbackDirs.py actually work
...
And explain what it does.
Fixes bug 22270 in 0.3.0.3-alpha.
2017-05-16 17:35:47 +10:00
Nick Mathewson
d88a19af7c
fix duplicate words in changelog
2017-05-15 18:43:27 -04:00
Nick Mathewson
f9f51933c1
forward-port changelog and releasenotes
2017-05-15 18:28:49 -04:00
Nick Mathewson
9b88254d1e
Merge branch 'maint-0.3.0'
...
"ours" merge to avoid feature bump
2017-05-15 18:25:31 -04:00
Nick Mathewson
8324631dd9
bump version to 0.3.0.7
2017-05-15 18:25:07 -04:00
Nick Mathewson
a546487287
Merge branch 'maint-0.3.0'
2017-05-15 18:24:38 -04:00
Nick Mathewson
0f718a85ea
Merge branch 'bug22246_030' into maint-0.3.0
2017-05-15 18:24:24 -04:00
Nick Mathewson
294d80044d
remove a variable I missed
2017-05-15 18:16:58 -04:00
Nick Mathewson
d3279d4304
Do not try to uncompress an empty spool
2017-05-15 18:13:38 -04:00
Nick Mathewson
460b923026
fix a memory leak
2017-05-15 18:13:20 -04:00
Nick Mathewson
6e2eb0afdb
Merge branch 'prop140_aftermath_url_v3'
2017-05-15 18:05:32 -04:00
Nick Mathewson
e1b3c1bbec
Test fix: always set address in new_dir_conn()
2017-05-15 18:00:38 -04:00
Nick Mathewson
f9d8ade912
Dircache protocol version 2 adds support for diffs
2017-05-15 17:53:36 -04:00
Nick Mathewson
da6b00443c
Try not to mess up caches with the X-Or-Diff-From-Consensus header
2017-05-15 17:53:15 -04:00
Nick Mathewson
4531fdbbff
Split consensus-request parsing into a separate function
...
This ought to make the control flow a tiny bit more readable.
2017-05-15 17:51:53 -04:00
Nick Mathewson
eb3c8d376d
Prop140, continued: accept "diff/<HASH>" in URLs, per proposal.
2017-05-15 17:42:17 -04:00
Nick Mathewson
afef059795
Merge remote-tracking branch 'public/prop140_aftermath_cfg'
2017-05-15 17:26:47 -04:00
Nick Mathewson
dae1242532
Merge branch 'ahf_bugs_21667_2_squashed'
2017-05-15 17:22:12 -04:00
Alexander Færøy
9e3f304113
Fix dir_handle_get/... test-cases for prop#278 support.
...
See: https://bugs.torproject.org/21667
2017-05-15 17:21:55 -04:00
Nick Mathewson
65d9408448
dir_handle_get: repair two test cases, note the fixes for 3 others
2017-05-15 17:21:55 -04:00
Alexander Færøy
008194035f
Handle non-compressed requests gracefully.
...
This patch makes us use FALLBACK_COMPRESS_METHOD to try to fetch an
object from the consensus diff manager in case no mutually supported
result was found. This object, if found, is then decompressed using the
spooling system to the client.
See: https://bugs.torproject.org/21667
2017-05-15 17:21:55 -04:00
Alexander Færøy
8d730af0f7
Remove old consensus fetching code from handle_get_current_consensus().
...
This patch removes the calls to spooled_resource_new() when trying to
download the consensus. All calls should now be going through the
consdiff manager.
See: https://bugs.torproject.org/21667
2017-05-15 17:21:55 -04:00
Alexander Færøy
fade313ba3
Fix too wide line from make check-spaces
.
...
See: https://bugs.torproject.org/21667
2017-05-15 17:21:55 -04:00
Alexander Færøy
ae33deb91d
Check for best consensus when no consensusdiff was found.
...
This patch ensures that we use the current consensus in the case where
no consensus diff was found or a consensus diff wasn't requested.
See: https://bugs.torproject.org/21667
2017-05-15 17:21:55 -04:00
Nick Mathewson
7591518d16
Copy valid/fresh-until and signatories values into diffs.
2017-05-15 17:21:55 -04:00
Nick Mathewson
fd1190581d
Store fresh/valid-until and signatories values on all consensus objects.
2017-05-15 17:21:55 -04:00