05ded76cb6
Merge remote-tracking branch 'arma/bug6759'
2012-09-04 10:18:51 -04:00
3da9a14f1c
Merge remote-tracking branch 'arma/feature6758'
2012-09-04 10:16:15 -04:00
3ea37e5faa
quiet "I learned some more directory information" on startup
...
Reserve it for when new directory information arrives in response to
a fetch.
Resolves ticket 6760.
2012-09-03 19:49:44 -04:00
2131cc125b
Don't log about reloading the microdescriptor cache at startup
...
Addresses bug 6759.
2012-09-03 18:50:27 -04:00
e964f81143
omit the first heartbeat message (resolves ticket 6758)
2012-09-03 18:13:35 -04:00
48a6816eb5
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-31 18:39:27 -04:00
b17bb543da
Merge branch 'bug6732' into maint-0.2.3
2012-08-31 18:39:11 -04:00
65a65edd6b
Remove changes files which have been removed in release-0.2.3
2012-08-31 18:37:56 -04:00
774979ca45
Document consensus and microdesc files
...
Bugfix for #6732 .
2012-08-31 11:35:47 -04:00
3363a0d26e
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-27 16:39:30 -04:00
a7a4bbff47
Quiet "Set buildtimeout to low val" warnings: make them info
...
Fix for #6251
2012-08-27 16:37:09 -04:00
f40378118c
Merge remote-tracking branch 'mikeperry/bug6647'
2012-08-27 16:23:19 -04:00
b252ffa7cb
Downgrade path-bias warning messages to INFO for now.
...
We've had over two months to fix them, and didn't. Now we need
0.2.3.x stable. Yes, it would be cool to get this working in
0.2.3.x, but not at the expense of delaying every other feature that
_does_ work in 0.2.3.x. We can do a real fix in 0.2.4.
2012-08-27 16:18:35 -04:00
0c5a44ed0a
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-27 16:16:27 -04:00
bffe0d3ccc
Merge branch 'bug6710_023' into maint-0.2.3
2012-08-27 16:15:01 -04:00
e232938ec8
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-27 16:09:29 -04:00
443e4ae1ee
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
...
Conflicts:
src/or/policies.c
2012-08-27 16:07:04 -04:00
0ccd57f0f2
and fix them here too
2012-08-27 14:28:00 -04:00
0c13547ea9
Bug 6647: Add changes file
2012-08-27 11:15:35 -07:00
45b520b6a4
Fix changes file for 6710: before 0.0.8pre1, you couldn't extend to
...
a router that another router wasn't already connected to.
2012-08-27 12:29:04 -04:00
62d96284f7
Do not assert when comparing a null address/port against a policy
...
This can create a remote crash opportunity for/against directory
authorities.
2012-08-27 12:04:55 -04:00
b7c172c9ec
Disable extending to private/internal addresses by default
...
This is important, since otherwise an attacker can use timing info
to probe the internal network.
Also, add an option (ExtendAllowPrivateAddresses) so that
TestingTorNetwork won't break.
Fix for bug 6710; bugfix on all released versions of Tor.
2012-08-27 11:19:29 -04:00
7795f42e4b
Merge branch 'bug6524_nm'
2012-08-27 10:33:24 -04:00
09d90b1b65
Changes file for nonrecursive make branch
2012-08-27 10:28:45 -04:00
b3b4f31936
Merge remote-tracking branch 'linus/bug6364'
2012-08-27 09:53:37 -04:00
6f7dbd3d34
Merge remote-tracking branch 'linus/bug6362'
2012-08-27 09:50:22 -04:00
6864a44a4a
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-24 12:51:50 -04:00
ce4add498f
Merge remote-tracking branch 'public/bug6472' into maint-0.2.3
2012-08-24 12:51:02 -04:00
3410a46ebc
Move ipv6_preferred from routerinfo_t to node_t.
...
Move extend_info_from_router() from circuitbuild.c to router.c and
make it static.
Add get_configured_bridge_by_orports_digest() and have
get_configured_bridge_by_routerinfo() and
node_is_a_configured_bridge() use it. We now consider all OR ports of
a bridge when looking for it.
Move node_get_*_orport to nodelist.c.
Fix a cut'n'paste error in header of nodelist.h.
Add node_assert_ok().
Add router_get_all_orports(). It's duplicating code from
node_get_all_orports(). Worth fixing at the cost of complicating the
API slightly?
2012-08-23 22:13:12 +02:00
5b0ed1e344
Remove #6480 fix from 0.2.2.38 changelog - it was not included
...
(Forward-port from release-0.2.2 to master)
2012-08-22 12:36:08 -04:00
939d01f0ba
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-21 10:36:51 -04:00
991a8acba2
Merge remote-tracking branch 'public/bug6404' into maint-0.2.3
2012-08-21 10:35:40 -04:00
9216e2819b
Send IPv6 address in NETINFO cells.
...
Closes #6364 .
2012-08-20 17:01:18 +02:00
5671586dc7
Make all relays, not only bridges, capable of advertising an IPv6 OR port.
...
Closes #6362 .
2012-08-19 14:48:22 +02:00
223e7cfabe
When iterating over connections pending DNS, skip marked ones
...
Failure to do this would lead to double-free cases and similar,
especially when the exit's DNS was broken. See bug 6472 for full
details; this is a fix for 6472.
Anonymous patch from "cypherpunks" on trac.
2012-08-17 16:46:11 -04:00
1c64f99a1a
Merge remote-tracking branch 'public/bug5124'
2012-08-17 16:05:09 -04:00
d9746bd468
Remove needless flush-on-write code.
...
Long ago, before we had cell queues, it was necessary to maybe call
connection_handle_write() from connectino_write_to_buf_impl() on OR
connections, so that we wouldn't get into a loop of reading infinite
amounts of data and queueing it all on an outbuf before bothering to
write any data.
If that doesn't sounds like what our code does now, you're right:
right now, we won't stick more than OR_CONN_HIGHWATER bytes of cells
on an outbuf, and we won't suck more than CELL_QUEUE_HIGHWATER_SIZE
cells off any edge connection. So, there's no more call for that
code.
Removing this code will simplify our data flow, and that should be
something we can all get behind.
2012-08-17 16:01:30 -04:00
a9d56289ee
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-17 15:59:40 -04:00
9ed87b37d0
Consider IPv6 OR ports when deciding whether a routerinfo change is cosmetic.
...
Closes #6423 .
2012-08-17 15:59:13 -04:00
851197f11d
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-17 14:04:28 -04:00
97602c9de4
Merge branch 'bug6379' into maint-0.2.3
2012-08-17 13:57:07 -04:00
eec86939d1
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-17 12:39:31 -04:00
e9172e51fb
Merge remote-tracking branch 'public/bug6244_part_c' into maint-0.2.3
2012-08-17 12:37:49 -04:00
1728801bbc
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-17 12:34:52 -04:00
676f71054f
Merge remote-tracking branch 'public/bug6507' into maint-0.2.3
2012-08-17 12:33:17 -04:00
a4669d8704
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-17 12:10:44 -04:00
3621f30ad4
Merge remote-tracking branch 'mikeperry/bug6475' into maint-0.2.3
2012-08-17 12:08:42 -04:00
274e281741
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-17 11:54:05 -04:00
f25e8d034b
Merge remote-tracking branch 'public/bug6514' into maint-0.2.3
2012-08-17 11:53:06 -04:00
4e42a8a2f2
Address Nick's comments from code review.
...
Also promote log messages to notice and rate-limit them.
2012-08-16 16:29:19 -07:00
Nick Mathewson
Roger Dingledine
Mike Perry
Linus Nordberg
Peter Palfrader