be741d7e63
Merge branch 'maint-0.3.0'
2017-06-05 09:51:57 -04:00
41ed9e978b
Regenerate RSA->ed25519 identity crosscertificate as needed
2017-06-01 10:04:52 -04:00
1763aa058b
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.
2017-05-31 09:30:35 -04:00
c361458998
take some of the suggestions from cypherpunks on #6892
2017-05-30 14:17:49 -04:00
5860f0a7c8
Update the torify.1 manpage
...
I went into this to fix 6892 and say "we don't do anything for
circuit isolation." But instead I did a fair amount of text-removal
to stop implying that torify does anything more than call torsocks.
2017-05-30 14:15:42 -04:00
4a15b31696
Merge remote-tracking branch 'argonblue/bug22413'
2017-05-30 13:33:49 -04:00
90dd7dc92a
Check for libzstd >= 1.1
...
The consensus compression code depends on a streaming compression API
that is new in libzstd-1.1.
Fixes #22413 .
2017-05-30 13:25:34 -04:00
c0559b97b5
Merge branch 'maint-0.3.0'
2017-05-30 13:21:06 -04:00
5b33d95a3d
hs: Correctly validate v3 descriptor encrypted length
...
The encrypted_data_length_is_valid() function wasn't validating correctly the
length of the encrypted data of a v3 descriptor. The side effect of this is
that an HSDir was rejecting the descriptor and ultimately not storing it.
Fixes #22447
Signed-off-by: David Goulet <dgoulet@torproject.org >
2017-05-30 10:27:42 -04:00
671c5dcde3
Merge remote-tracking branch 'public/bug6298'
2017-05-30 10:27:37 -04:00
0fbe1a2c6f
Merge remote-tracking branch 'teor/bug22424'
2017-05-30 08:50:45 -04:00
6bc9ff87b8
changes file for 22417
2017-05-30 08:48:50 -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
167e5be056
changes file for 22446
2017-05-30 08:33:27 -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
af891e7f2c
Changes file for bug 22424
2017-05-28 22:34:56 +10: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
159a8061cf
Mock tor_addr_lookup() during part of addr/basic test.
...
If this function isn't mocked, then our unit tests break on stupid
networks where localhost is broken or absent. Fixes bug 6298; bugfix
on 0.0.9pre2.
2017-05-26 13:53:32 -04:00
5742e4fd8e
bump version to 0.3.1.2-alpha-dev
2017-05-26 10:23:53 -04:00
1405bdebb0
Update releasing-tor to reflect current versions and tooling
...
(Note that a lot of the removed guidance is stuff that the tools
will do automatically.)
2017-05-26 10:01:04 -04:00
61625b8f26
Pedantry in the changelog.
2017-05-26 09:10:27 -04:00
0870660716
edit changelog
2017-05-26 09:04:51 -04:00
8cd01f5e5b
Start an 0.3.1.2-alpha mini-changelog
2017-05-26 09:00:38 -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
615dbdb0e0
pick a date
2017-05-22 12:03:45 -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
Nick Mathewson
Andreas Stieger
Roger Dingledine
Taylor Yu
David Goulet
Daniel Pinto
teor
Alexander Færøy