Nick Mathewson
48a6816eb5
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-31 18:39:27 -04:00
Nick Mathewson
b17bb543da
Merge branch 'bug6732' into maint-0.2.3
2012-08-31 18:39:11 -04:00
Nick Mathewson
65a65edd6b
Remove changes files which have been removed in release-0.2.3
2012-08-31 18:37:56 -04:00
Nick Mathewson
1652aeabff
Document the --branch argument to contrib/findMergedChanges.pl
2012-08-31 18:34:42 -04:00
Nick Mathewson
774979ca45
Document consensus and microdesc files
...
Bugfix for #6732 .
2012-08-31 11:35:47 -04:00
Nick Mathewson
9982122f34
Use a time-invariant comparison in choose_array_element_by_weight
2012-08-28 12:42:25 -04:00
Nick Mathewson
5c3199cda7
In choose-by-bw, scale to better use the range of uint64
...
The smart part of this is based on an approach and a suggestion by
rransom. The unsmart part is my own fault.
2012-08-27 19:36:12 -04:00
Nick Mathewson
ef628649c8
Spelling fix in util.c comments
2012-08-27 16:44:54 -04:00
Nick Mathewson
3363a0d26e
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-27 16:39:30 -04:00
Nick Mathewson
a7a4bbff47
Quiet "Set buildtimeout to low val" warnings: make them info
...
Fix for #6251
2012-08-27 16:37:09 -04:00
Nick Mathewson
f40378118c
Merge remote-tracking branch 'mikeperry/bug6647'
2012-08-27 16:23:19 -04:00
Nick Mathewson
2776a6b810
Merge (with -s ours) remote-tracking branch 'origin/maint-0.2.3'
...
We are doing this merge to avoid taking the patch from
"nickm/disable_pathbias_warnings_v2" into 0.2.4 -- we're going to try
to fix the pathbias code for real here.
2012-08-27 16:21:10 -04:00
Nick Mathewson
d98f2996b0
Merge branch 'disable_pathbias_warnings_v2' into maint-0.2.3
2012-08-27 16:19:52 -04:00
Nick Mathewson
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
Nick Mathewson
0c5a44ed0a
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-27 16:16:27 -04:00
Nick Mathewson
bffe0d3ccc
Merge branch 'bug6710_023' into maint-0.2.3
2012-08-27 16:15:01 -04:00
Nick Mathewson
e232938ec8
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-27 16:09:29 -04:00
Nick Mathewson
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
Nick Mathewson
1c30e6abc9
Merge branch 'bug6690_022' into maint-0.2.2
2012-08-27 16:03:48 -04:00
Roger Dingledine
0ccd57f0f2
and fix them here too
2012-08-27 14:28:00 -04:00
Mike Perry
0c13547ea9
Bug 6647: Add changes file
2012-08-27 11:15:35 -07:00
Nick Mathewson
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
Nick Mathewson
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
Nick Mathewson
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
Nick Mathewson
5898c09c3a
Fix whitespace
2012-08-27 10:53:40 -04:00
Nick Mathewson
7795f42e4b
Merge branch 'bug6524_nm'
2012-08-27 10:33:24 -04:00
Nick Mathewson
09d90b1b65
Changes file for nonrecursive make branch
2012-08-27 10:28:45 -04:00
Nick Mathewson
f1b33ce81a
Update .gitignore with new autotools droppings from nonrecursive make
2012-08-27 10:12:01 -04:00
Jim Meyering
7638612f01
Better fix to avoid loudness on mkdir -p
...
(commit message by nickm)
2012-08-27 10:05:02 -04:00
Jim Meyering
90d1c85757
build: minimal adjustments to make out-of-tree build work
2012-08-27 10:00:22 -04:00
Nick Mathewson
b3b4f31936
Merge remote-tracking branch 'linus/bug6364'
2012-08-27 09:53:37 -04:00
Nick Mathewson
6f7dbd3d34
Merge remote-tracking branch 'linus/bug6362'
2012-08-27 09:50:22 -04:00
Nick Mathewson
6864a44a4a
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-24 12:51:50 -04:00
Nick Mathewson
ce4add498f
Merge remote-tracking branch 'public/bug6472' into maint-0.2.3
2012-08-24 12:51:02 -04:00
Nick Mathewson
ca09ea0a8b
Make node_assert_ok less duplicatey
...
This comes at the cost of making its failure message a little less
friendly, but since when do assertion failures count as
user-friendly?
2012-08-24 12:48:23 -04:00
Nick Mathewson
03ca9c63c8
Clarify docs on get_configured_bridge_by_*_digest
2012-08-24 12:31:09 -04:00
Nick Mathewson
5db37bca3d
We now need automake 1.9 or later
...
Automake 1.7 is too broken to even investigate why it broke at this point.
2012-08-24 10:29:05 -04:00
Mike Perry
e13abda470
Bug 6647: Use correct scale constant and prevent rounding error
...
We were effectively resetting our counts, and the rounding error
leads to incorrect log messages.
2012-08-23 20:28:29 -07:00
Mike Perry
4950618b13
Bug 6475: Demote pathbias log messages for 0.2.3.x
...
Also make a couple of them less scary.
We'll do a separate, additional commit on 0.2.4.x to bump them back
up again.
2012-08-23 20:28:25 -07:00
Mike Perry
880c71304b
Disable path bias accounting if we have no guards.
...
This should eliminate a lot of notices for Directory Authorities and other
situations where circuits built without using guard nodes.
2012-08-23 19:47:08 -07:00
Linus Nordberg
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
Nick Mathewson
0867479e3e
Add some attributes to make a2x quieter
2012-08-23 13:19:54 -04:00
Nick Mathewson
b67057a542
Make asciidoc generation quieter
2012-08-23 13:19:40 -04:00
Nick Mathewson
6d703f8db5
Make the _sha1.i file generation quieter
2012-08-23 13:14:41 -04:00
Nick Mathewson
3f66664935
Add missing dependency so the html.in files get built
2012-08-23 12:52:33 -04:00
Jim Meyering
8f60f70e21
Replace man_MANS with nodist_man1_MANS
...
(commit message by nickm)
2012-08-23 12:36:33 -04:00
Jim Meyering
0df149ff6e
s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/
...
Apparently the former will stop working with newer auto*
(commit message by nickm)
2012-08-23 12:35:21 -04:00
Peter Palfrader
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
Linus Nordberg
734b09080f
Fetch IPv6 address from NETINFO "other OR's address" field.
...
The my_apparent_addr is still unused, apart from now being logged in
the "Got good NETINFO cell" info message.
2012-08-21 18:43:36 +02:00
Nick Mathewson
64676d0571
Merge branch 'bug6638'
2012-08-21 11:20:58 -04:00
