Nick Mathewson
963e70673a
Merge remote-tracking branch 'teor/fix-frac-paths-comment'
2016-12-13 20:30:51 -05:00
teor
e2537a5982
Clarify a comment in compute_frac_paths_available
2016-12-14 10:25:01 +11:00
Nick Mathewson
387de08fb4
Merge branch 'ticket20960'
2016-12-13 18:03:43 -05:00
Nick Mathewson
55d02c004c
Remove AuthDirMaxServersPerAuthAddr
...
Back when Roger had do do most of our testing on the moria host, we
needed a higher limit for the number of relays running on a single
IP address when that limit was shared with an authority. Nowadays,
the idea is pretty obsolete.
Also remove the router_addr_is_trusted_dir() function, which served
no other purpose.
Closes ticket 20960.
2016-12-13 13:09:27 -05:00
Nick Mathewson
56b11905e5
Remove a little dead code from routerparse.c
...
In c35fad2bde
, merged in
0.2.4.7-alpha, we removed the code to parse v1 directory
objects. When we did so, we removed everything that could set the
CST_CHECK_AUTHORITY flag for check_signature_token().
So in this code, we remove the flag itself, the code to handle the
flag, and a function that only existed to handle the flag.
2016-12-13 09:36:59 -05:00
Nick Mathewson
bd2a1d0231
Update description of release practices
2016-12-12 15:38:51 -05:00
Nick Mathewson
954eeda619
Stop checking whether environ is declared.
...
There seems to be pretty good evidence that it's always declared,
and that checking for it is pointless.
Closes ticket 19142.
2016-12-12 10:55:10 -05:00
Nick Mathewson
54069b97d3
whitespace fix
2016-12-12 09:51:49 -05:00
Nick Mathewson
1bd562f1c4
Merge branch 'people-to-node-type'
2016-12-12 09:50:31 -05:00
J. Ryan Stinnett
d5df9fa235
Replace "people" with the appropriate network component in comments
...
Fixes #18145 .
2016-12-12 09:50:21 -05:00
Nick Mathewson
b659ffe9ac
Merge remote-tracking branch 'jryans/log-severity'
2016-12-12 09:46:07 -05:00
Nick Mathewson
1ad96ed9cd
Merge remote-tracking branch 'rubiate/ticket20511'
2016-12-12 09:20:56 -05:00
Nick Mathewson
9025991a8d
Fix a few warnings from lintChanges
2016-12-12 08:31:05 -05:00
Nick Mathewson
f564777f06
forward-port the 0.2.9.7-rc changelog
2016-12-12 08:26:36 -05:00
Nick Mathewson
876aeeb248
Merge branch 'maint-0.2.9'
...
Ours merge to avoid taking version bump.
2016-12-12 08:25:12 -05:00
Nick Mathewson
8384f4d26f
version bump: 0.2.9.7-rc-dev
2016-12-12 08:24:37 -05:00
Nick Mathewson
8143c30a5c
helper_compare_hs_desc: coverity memleak complaints
...
This test helper had a memory leak on failure, which Coverity Scan
doesn't like. Closes CID 1375996 and 1375997. Not in any released
Tor.
2016-12-12 08:10:05 -05:00
Nick Mathewson
936ce997bb
Remove changes files from master that are already in 0297-rc
2016-12-11 22:24:37 -05:00
Nick Mathewson
cbdb3c92f5
Merge branch 'maint-0.2.9'
2016-12-11 22:23:31 -05:00
Nick Mathewson
ef53526b10
Spell MAC_OS_X_VERSION_10_12 correctly.
...
Fixes 20935.
2016-12-11 22:17:14 -05:00
Nick Mathewson
14edb0bd0c
Merge branch 'maint-0.2.9'
...
"ours" merge to avoid taking version bump
2016-12-11 21:40:38 -05:00
Nick Mathewson
cf6da1e4c2
Bump version 0.2.9.7-rc
2016-12-11 21:39:50 -05:00
Nick Mathewson
7601edc29a
Merge remote-tracking branch 'dgoulet/bug20936_030_01'
2016-12-11 21:19:03 -05:00
Nick Mathewson
3e4a1ed7bb
Merge branch 'maint-0.2.9'
2016-12-11 20:40:12 -05:00
Nick Mathewson
87c000d19e
Merge remote-tracking branch 'dgoulet/bug20938_029_01' into maint-0.2.9
2016-12-11 20:40:01 -05:00
Nick Mathewson
4c5eb0b21d
Merge branch 'maint-0.2.9'
...
This is an "ours" merge to avoid taking a40d212383
,
which quiets a warning we'd like to keep seeing in alphas.
2016-12-11 20:37:22 -05:00
David Goulet
f3c040e33e
test: fix memory leak in single onion poisoning
...
Closes #20938
Signed-off-by: David Goulet <dgoulet@torproject.org>
2016-12-09 12:59:40 -05:00
David Goulet
d01a6c07ae
test: Fix memory leak in test_circuituse.c
...
Circuit object wasn't freed correctly. Also, the cpath build state object
needed to be zeroed else we were freeing garbage pointers.
Closes #20936
Signed-off-by: David Goulet <dgoulet@torproject.org>
2016-12-09 10:20:14 -05:00
Nick Mathewson
a40d212383
Downgrade a harmless bug warning to info.
...
Makes 19926 less annoying in 0.2.9. In 0.3.0, we should actually
fix this.
2016-12-09 08:43:09 -05:00
Nick Mathewson
f2445fc608
Merge branch 'maint-0.2.9'
2016-12-09 08:34:30 -05:00
Nick Mathewson
adaf6a422a
Merge branch 'maint-0.2.8' into maint-0.2.9
2016-12-09 08:34:24 -05:00
Nick Mathewson
56a2b8dc6e
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-12-09 08:34:18 -05:00
Nick Mathewson
b49369badd
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-12-09 08:34:12 -05:00
Nick Mathewson
3d9f8ff6a5
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-12-09 08:34:06 -05:00
Nick Mathewson
3d2d3f2b62
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-12-09 08:33:57 -05:00
Nick Mathewson
a3b8286b0e
Merge branch 'maint-0.2.9'
2016-12-09 08:30:55 -05:00
David Goulet
9bb3bcbc41
router: Fix memory leak in signed_descriptor_move()
...
The signed_descriptor_move() was not releasing memory inside the destination
object before overwriting it with the source object. This commit adds a reset
function that free that memory inside a signed descriptor object and zero it.
Closes #20715 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2016-12-09 08:30:46 -05:00
Karsten Loesing
9db47e7921
Update geoip and geoip6 to the December 7 2016 database.
2016-12-09 10:23:36 +01:00
J. Ryan Stinnett
231564ee5b
Document no changes file needed for bugfixes on unreleased code
...
Fixes #20932 .
2016-12-08 16:48:00 -10:00
Nick Mathewson
39f4554687
Fix a completely stupid stack-protector warning in test_channels.c
...
This was breaking the build on debian precise, since it thought that
using a 'const int' to dimension an array made that array
variable-size, and made us not get protection.
Bug not in any released version of Tor.
I will insist that this one wasn't my fault.
"Variables won't. Constants aren't." -- Osborn's Law
2016-12-08 17:50:01 -05:00
Nick Mathewson
bc68eedd79
Update to trunnel 1.5.1
2016-12-08 16:59:25 -05:00
Nick Mathewson
e1f00c5f86
whitespace cleanups
2016-12-08 16:53:29 -05:00
Nick Mathewson
e93234af70
Merge branch 'feature15056_v1_squashed'
2016-12-08 16:49:24 -05:00
Nick Mathewson
236e8b605e
Adding some assertions to onion.c
2016-12-08 16:48:01 -05:00
Nick Mathewson
d0b76f5099
Fix comment on connection_or_client_learned_peer_id().
2016-12-08 16:48:01 -05:00
Nick Mathewson
5eef00eb04
Tiny cleanup of chan handling when setting connection ID digests
2016-12-08 16:48:01 -05:00
Nick Mathewson
9bf9e34a01
Use connection_or_clear_identity in connection_or_clear_identity_map.
2016-12-08 16:48:01 -05:00
Nick Mathewson
937aef48ee
Add an ed25519_copy; use it in a couple of places dgoulet suggested.
2016-12-08 16:48:01 -05:00
Nick Mathewson
a7cae7f8f7
Changes file for feature 15056 (prop220, extend cell side)
2016-12-08 16:48:00 -05:00
Nick Mathewson
835b04819a
Add some unit testing for ed25519 IDs in extend2 cells.
2016-12-08 16:48:00 -05:00