Nick Mathewson
bf71866da0
Merge branch 'remove_old_ver_checks'
2012-09-10 15:37:13 -04:00
Nick Mathewson
4319f99828
Merge remote-tracking branch 'public/ticket6789'
2012-09-10 15:31:04 -04:00
Nick Mathewson
3e8058f9ed
Be more clear in changes file for 6797.
2012-09-10 10:21:46 -04:00
Nick Mathewson
0ab7716b9e
Merge remote-tracking branch 'linus/bug6797'
2012-09-10 10:19:57 -04:00
Nick Mathewson
20e0e7d9d1
Rename _UseFilteringSSLBufferevents to lose its _. Bug 3155
2012-09-10 10:09:19 -04:00
Nick Mathewson
38f3f3baf9
bug3155 changes file
2012-09-10 10:04:30 -04:00
Roger Dingledine
e1e34ee4e4
raise bandwidthrate/bandwidthburst to a new "infinite"
...
addresses bug 6605.
2012-09-10 03:03:06 -04:00
Linus Nordberg
93ee62297f
Don't follow the NULL pointer.
...
If dirvote_create_microdescriptor() returns NULL, don't use md.
Found by "f. tp.".
Fixes bug 6797.
2012-09-10 00:43:48 +02:00
Nick Mathewson
7988596f66
Remove version_supports checks for versions before 0.2.2.
2012-09-07 23:21:18 -04:00
Nick Mathewson
26cee96911
Dirservers no longer accept tors released before December 2011.
...
Implements ticket 6789.
2012-09-07 11:15:23 -04:00
Nick Mathewson
1ca9e2685f
Merge branch 'quiet_lib_versions_squashed'
2012-09-06 11:32:09 -04:00
Nick Mathewson
7607ad2bec
Detect openssl header version doesn't match runtime version
...
We already do this for libevent; let's do it for openssl too.
For now, I'm making it always a warn, since this has caused some
problems in the past. Later, we can see about making it less severe.
2012-09-06 11:31:30 -04:00
Nick Mathewson
e3a130a7eb
Don't log about Libevent/OpenSSL initialization when all's well
...
OTOH, log the Libevent and OpenSSL versions on the first line when
we're starting Tor.
2012-09-06 11:31:22 -04:00
Nick Mathewson
ad1e8b45df
Merge branch 'bug6778'
2012-09-06 11:05:16 -04:00
Nick Mathewson
30fe9080e7
Fix a dependency: micro-revision.i influences tor_main.o, not tor_main.c
2012-09-06 11:00:32 -04:00
Nick Mathewson
e9684405ac
Merge remote-tracking branch 'asn/bug4567_rebased'
2012-09-06 10:12:28 -04:00
Nick Mathewson
5d162d5a7b
Fix a dependency: sha256.c influences crypto.o, not crypto.c
2012-09-06 10:03:06 -04:00
Nick Mathewson
91fed2c703
Fix a build-warning when building out-of-tree
...
We were trying to incorporate all headers in common_sha1.i, not just
the src/common ones.
This is part of bug 6778; fix on 0.2.4.1-alpha
2012-09-06 09:56:48 -04:00
Nick Mathewson
5d679caa32
Fix warning when implicitly casting strlen(microdesc) to int
...
Harmless unless we somehow generate a microdesc of more than INT_MAX
bytes.
2012-09-05 20:49:25 -04:00
Roger Dingledine
325f33047a
and fold it into master too
2012-09-05 17:23:08 -04:00
Nick Mathewson
f8c1ab7bbf
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-05 16:25:13 -04:00
Nick Mathewson
9d9ca264ec
Avoid segfault if EntryGuardPathBias precedes EntryGuard
...
Fix for bug 6774; bugfix on 0.2.3.17-beta.
2012-09-05 13:27:54 -04:00
George Kadianakis
44fe717524
General tweaks and fixes for Nick's comments.
...
* Add changes/ files.
* Edit the tor-fw-helper manpage.
* Fix check-spaces.
* Add prototype for get_list_of_ports_to_forward().
* Fix tor_parse_long() TCP port range.
* Improve doc. of tor_check_port_forwarding().
* Check for overflows in tor_check_port_forwarding().
* Demote successful port forwarding to LOG_INFO.
Conflicts:
src/common/address.c
src/or/circuitbuild.c
2012-09-05 18:23:28 +03:00
Roger Dingledine
c77d1b7bda
fold in the changes files
...
in-progress due to various bugs i uncovered in the ipv6 config option
meanings.
2012-09-05 04:46:44 -04:00
Roger Dingledine
de6a538b9c
one more already-merged changes file
2012-09-04 20:23:46 -04:00
Roger Dingledine
031da8dd34
remove the changes files that are merged into 0.2.3.21-rc
2012-09-04 20:11:19 -04:00
Nick Mathewson
4d87919ba6
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-04 18:34:39 -04:00
Nick Mathewson
d7a646edcf
Merge branch 'bug5535_only_rebased'
2012-09-04 18:24:20 -04:00
Linus Nordberg
e04e1a2e7d
Clients connect to public relays over IPv6.
...
Add ClientUseIPv6 and ClientPreferIPv6ORPort configuration options.
Use "preferred OR port" for all entry nodes, not only for bridges.
Mark bridges with "prefer IPv6 OR port" if an IPv6 address is
configured in Bridge line and ClientPreferIPv6ORPort is set.
Mark relays with "prefer IPv6 OR port" if an IPv6 address is found in
descriptor and ClientPreferIPv6ORPort is set.
Filter "preferred OR port" through the ClientUseIPv6 config option. We
might want to move this test to where actual connection is being set
up once we have a fall back mechanism in place.
Have only non-servers pick an IPv6 address for the first hop: We
don't want relays to connect over IPv6 yet. (IPv6 has never been used
for second or third hops.)
Implements ticket 5535.
2012-09-04 12:57:21 -04:00
Linus Nordberg
156ffef249
Have directory authorities vote on IPv6 OR ports according to the spec
...
Define new new consensus method 14 adding "a" lines to vote and
consensus documents.
From proposal 186:
As with other data in the vote derived from the descriptor, the
consensus will include whichever set of "a" lines are given by the
most authorities who voted for the descriptor digest that will be
used for the router.
This patch implements this.
2012-09-04 11:52:22 -04:00
Nick Mathewson
05ded76cb6
Merge remote-tracking branch 'arma/bug6759'
2012-09-04 10:18:51 -04:00
Nick Mathewson
3da9a14f1c
Merge remote-tracking branch 'arma/feature6758'
2012-09-04 10:16:15 -04:00
Roger Dingledine
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
Roger Dingledine
2131cc125b
Don't log about reloading the microdescriptor cache at startup
...
Addresses bug 6759.
2012-09-03 18:50:27 -04:00
Roger Dingledine
e964f81143
omit the first heartbeat message (resolves ticket 6758)
2012-09-03 18:13:35 -04:00
Roger Dingledine
eb3d079667
Make begindir_cutoff the same as general_cutoff
...
Allow one-hop directory fetching circuits the full "circuit build timeout"
period, rather than just half of it, before failing them and marking
the relay down. This fix should help reduce cases where clients declare
relays (or worse, bridges) unreachable because the TLS handshake takes
a few seconds to complete.
Fixes bug 6743 (one piece of bug 3443); bugfix on 0.2.2.2-alpha, where
we changed the timeout from a static 30 seconds.
2012-09-01 01:25:17 -04:00
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
774979ca45
Document consensus and microdesc files
...
Bugfix for #6732 .
2012-08-31 11:35:47 -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
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
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
