0fbe1a2c6f
Merge remote-tracking branch 'teor/bug22424'
2017-05-30 08:50:45 -04:00
184d889f8a
Merge remote-tracking branch 'jigsaw/fix-22417-without-3-star'
2017-05-30 08:47:14 -04:00
f9615f9d77
Merge remote-tracking branch 'teor/bug22421'
2017-05-30 08:42:20 -04:00
e5f4642db3
Fix GCC 7 -Wimplicit-fallthrough warnings
...
Add magic comments recognized by default -Wimplicit-fallthrough=3
or break, as required.
2017-05-30 08:33:27 -04:00
d1580ad49b
remove obsolete comment
...
we should have taken out this comment with commit aadff6274
2017-05-30 02:42:32 -04:00
94d321120e
Replace 3-star pointer with 2-star pointer
2017-05-28 20:24:48 +01:00
79725289e1
If we do underflow the know usage of a storage, recalculate it
...
Fixes bug #22424 on 0.3.1.1-alpha.
2017-05-28 22:34:43 +10:00
69b234a0a8
Refactor storage usage reductions into a static function
...
No behaviour change.
Part of #22424 .
2017-05-28 22:28:43 +10:00
334fe6bb6b
Don't underflow usage when it is unknown and a file is removed
...
Part of #22424 .
2017-05-28 22:16:00 +10:00
9e36b0beb9
Always check for usage underflow when removing a file in storage.c
...
Part of #22424 .
2017-05-28 22:12:09 +10:00
f6841ae263
Fix comment typos in storage.c
2017-05-28 22:11:22 +10:00
25ea8be9de
Update the client bootstrap comment in config.c for exponential backoff
...
This brings the description up to date with the exponential backoff
code introduced in 0.2.9.1-alpha.
Fixes bug #22421 .
2017-05-28 21:01:08 +10:00
f8ccf8d9a9
Fix crash with %include
...
Fixes crash when including a folder that contains a non-empty file
without any values followed by any other non-empty file.
2017-05-28 09:53:14 +01:00
6fcaf83c98
Cleanup MOCK_IMPL (etc) to be findable with etags
...
A fair number of our mock_impl declarations were messed up so that
even our special AM_ETAGSFLAGS couldn't find them.
This should be a whitespace-only patch.
2017-05-26 14:07:06 -04:00
5742e4fd8e
bump version to 0.3.1.2-alpha-dev
2017-05-26 10:23:53 -04:00
2550ac7bb1
update version to 0.3.1.2-alpha
2017-05-26 08:58:08 -04:00
ab9976b724
Merge remote-tracking branch 'arma/bug22368'
2017-05-25 08:54:51 -04:00
657297a9f8
Merge branch 'maint-0.3.0'
2017-05-25 00:28:11 -04:00
83439e78cc
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-05-25 00:27:27 -04:00
ec61ae59a5
Stop leaking keypin-rejected routerinfos on directory authorities
...
When directory authorities reject a router descriptor due to keypinning,
free the router descriptor rather than leaking the memory.
Fixes bug 22370; bugfix on 0.2.7.2-alpha.
2017-05-25 00:09:40 -04:00
5f74749fba
get rid of some dead code (leftover from commit fa04fe1)
2017-05-24 23:37:00 -04:00
d22d565331
add copy of MyFamily element to the descriptor, not the element itself
...
If we add the element itself, we will later free it when we free the
descriptor, and the next time we go to look at MyFamily, things will
go badly.
Fixes the rest of bug 22368; bugfix on 0.3.1.1-alpha.
2017-05-24 23:37:00 -04:00
a7e75ff796
don't free the values in options->MyFamily when we make a descriptor
...
If we free them here, we will still attempt to access the freed memory
later on, and also we will double-free when we are freeing the config.
Fixes part of bug 22368.
2017-05-24 23:32:32 -04:00
511c900686
Merge branch 'master' of git-rw.torproject.org:/tor
2017-05-24 10:25:00 -04:00
b80a35e683
Improve the message we log on unexpected dirauth status code
...
It's still not great, but should be less confusing what's wrong
here.
Closes ticket 1121.
2017-05-24 09:08:59 -04:00
cabad0b6c7
remove unused node_get_published_on function
...
in retrospect, we should have removed this with commit 1289474d#11742 , which was the last caller of it.
2017-05-24 00:43:44 -04:00
af98b862a5
Fix comments of functions that return tor_snprintf
...
No code changes needed: in the places where we actually check the
return value of these functions, we handle it correctly.
2017-05-23 18:44:45 +10:00
4e3ea6d5c8
fix minor grammar error in comment
2017-05-22 20:06:38 -04:00
d9b1471303
Merge remote-tracking branch 'ahf/bugs/22305'
2017-05-22 11:57:03 -04:00
9604980733
Log a warning if we receive a disallowed compression method for an anonymous connection.
...
See: https://bugs.torproject.org/22305
2017-05-22 15:52:41 +00:00
281f06a094
bump to 0.3.1.1-alpha
2017-05-22 11:52:19 -04:00
9a50c73104
Merge remote-tracking branch 'ahf/bugs/22305'
2017-05-22 10:57:26 -04:00
5a0eab68e1
Ensure that only GZip and Zlib compression is handled for anonymous connections.
...
See: https://bugs.torproject.org/22305
2017-05-22 14:45:12 +00:00
2b26ac1390
Refactor error path handling in connection_dir_client_reached_eof().
...
This patch lifts the return value, rv, variable to the beginning of the
function, adds a 'done' label for clean-up and function exit and makes
the rest of the function use the rv value + goto done; instead of
cleaning up in multiple places.
See: https://bugs.torproject.org/22305
2017-05-22 14:42:18 +00:00
cfe0a45750
Fix a compilation warning about duplicate typedef
2017-05-22 10:39:43 -04:00
e5a929fef8
Raise common code for creating circuit_guard_state_t
...
This will help if we ever need to add more fields or change the
semantics of existing fields.
2017-05-22 09:13:18 -04:00
b2e9a107b7
Merge remote-tracking branch 'asn/bug21969_bridges'
2017-05-22 09:09:16 -04:00
52498b8183
Set guard state on bridge descriptor fetches.
...
We used to not set the guard state in launch_direct_bridge_descriptor_fetch().
So when a bridge descriptor fetch failed, the guard subsystem would never
learn about the fail (and hence the guard's reachability state would not
be updated).
2017-05-22 15:57:33 +03:00
26795da900
Don't add "Accept-Encoding" header if directory connection is anonymous.
...
See: https://bugs.torproject.org/22305
2017-05-22 12:36:27 +00:00
90894c87a5
Merge branch 'maint-0.3.0'
2017-05-22 08:32:18 -04:00
5c52d3c2c0
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-05-22 08:32:07 -04:00
6e5486b11a
dir auths reject 0.2.9.x for x<5, due to bug 20499
...
Directory authorities now reject relays running versions
0.2.9.1-alpha through 0.2.9.4-alpha, because those relays
suffer from bug 20499 and don't keep their consensus cache
up-to-date.
Resolves ticket 20509.
2017-05-22 08:31:39 -04:00
0698a0beca
fix two typos in comments
...
closes ticket 22322
2017-05-22 01:43:52 -04:00
a18b41cc77
fix typo in comment
2017-05-19 22:14:56 -04:00
09b3cb0d72
Whoops; I broke check-spaces.
2017-05-19 16:02:58 -04:00
13034e1574
Try another approach to fixing the bug in the #1922 test.
...
This isn't elegant, but it seems to be the best way around all of
the issues involved in escaping and quoting that we've gotten into
over the years.
2017-05-19 15:50:29 -04:00
19615bce64
mingw fix: avoid "unused var" warning.
2017-05-19 15:50:12 -04:00
8cb08f716d
fix a coverity resource leak warning
2017-05-19 15:20:57 -04:00
4e6b13a38a
Fix uninitialized-variable warning on options_init_from_string().
2017-05-19 15:18:27 -04:00
d950ad0dfd
Remove call to get_unquoted_path in config_process_include()
...
parse_config_line_from_str_verbose() already looks for strings
that are surrounded by quotes, and processes them with
unescape_string(). So things were getting decoded twice, which was
(in turn) playing havoc with backslashes on Windows.
2017-05-19 14:09:51 -04:00
Nick Mathewson
Andreas Stieger
Roger Dingledine
Daniel Pinto
teor
Alexander Færøy
George Kadianakis