Commit Graph
164 Commits
Author SHA1 Message Date
Roger Dingledine 7da1ae7adf Merge branch 'maint-0.2.1' into release-0.2.1 2012-01-05 06:43:13 -05:00
Roger Dingledine df17b62d54 add a changes file for ticket 4825 2012-01-05 06:42:26 -05:00
Roger Dingledine 0b74f64275 Merge branch 'maint-0.2.1' into release-0.2.1 2012-01-05 06:38:15 -05:00
Nick Mathewson 120a745346 Bug 4786 fix: don't convert EARLY to RELAY on v1 connections
We used to do this as a workaround for older Tors, but now it's never
the correct thing to do (especially since anything that didn't
understand RELAY_EARLY is now deprecated hard).
2011-12-28 15:54:06 -05:00
Nick Mathewson aea35fbb1b Changelog and blurb for 0.2.1.32 2011-12-15 11:38:00 -05:00
Nick Mathewson 03c7d9e992 Merge branch 'maint-0.2.1' into release-0.2.1 2011-12-15 11:35:23 -05:00
Nick Mathewson 9d0777839b Add a fix for the buf_pullup bug that Vektor reported 2011-12-15 11:28:24 -05:00
Nick Mathewson 5eff44ca8e Update the release-0.2.1 changelog while I am at it 2011-12-14 16:09:13 -05:00
Nick Mathewson 67357ca9f3 Merge branch 'maint-0.2.1' into release-0.2.1 2011-12-14 16:06:03 -05:00
Karsten Loesing ff2c9acbb3 Update to the December 2011 GeoIP database. 2011-12-08 09:55:44 +01:00
Nick Mathewson 13f02c387f Merge remote-tracking branch 'karsten/geoip-november2011' into maint-0.2.1 2011-11-14 11:10:10 -05:00
Karsten Loesing 6d45c6d548 Update to the November 2011 GeoIP database. 2011-11-07 14:23:48 +01:00
Sebastian Hahn be6928d6e7 Add a changes file for 4410 2011-11-06 18:00:10 +01:00
Roger Dingledine 6bb9bd17d0 fold in changes files 2011-10-26 18:02:13 -04:00
Roger Dingledine 6097b8eefc Merge branch 'maint-0.2.1' into release-0.2.1 2011-10-26 17:41:24 -04:00
Robert Ransom a74e7fd40f Reject create cells on outgoing OR connections from bridges 2011-10-26 23:21:14 +02:00
Roger Dingledine 031d8fcdab merge in more changes entries 2011-10-26 17:21:07 -04:00
Robert Ransom af12c39d6d Don't use any OR connection which sent us a CREATE_FAST cell for an EXTEND
Fix suggested by Nick Mathewson.
2011-10-26 23:20:56 +02:00
Nick Mathewson 638fdedcf1 Don't send a certificate chain on outgoing TLS connections from non-relays 2011-10-26 23:20:56 +02:00
Roger Dingledine 9f61d8a3b3 Merge branch 'maint-0.2.1' into release-0.2.1 2011-10-26 17:13:18 -04:00
Nick Mathewson a166f10414 Remove the -F option from tor-resolve.
It used to mean "Force": it would tell tor-resolve to ask tor to
resolve an address even if it ended with .onion.  But when
AutomapHostsOnResolve was added, automatically refusing to resolve
.onion hosts stopped making sense.  So in 0.2.1.16-rc (commit
298dc95dfd), we made tor-resolve happy to resolve anything.

The -F option stayed in, though, even though it didn't do anything.
Oddly, it never got documented.

Found while fixing GCC 4.6 "set, unused variable" warnings.
2011-10-26 17:13:04 -04:00
Roger Dingledine a68867b150 manually backport a5232e0c4c 2011-10-26 17:11:52 -04:00
Roger Dingledine 9ac4ceb0d4 Merge branch 'maint-0.2.1' into release-0.2.1 2011-10-26 16:34:20 -04:00
Nick Mathewson 55d9e4b8ba Reinit keys at the start of options_act().
Previously we did this nearer to the end (in the old_options &&
transition_affects_workers() block).  But other stuff cares about
keys being consistent with options... particularly anything which
tries to access a key, which can die in assert_identity_keys_ok().

Fixes bug 3228; bugfix on 0.2.2.18-alpha.

Conflicts:

	src/or/config.c
2011-10-26 22:09:44 +02:00
Robert Ransom 62c29a93ba Don't crash a bridge authority on SIGHUP if it's not in the consensus
Fixes bug 2572.
2011-10-26 22:09:44 +02:00
Sebastian Hahn 9082898944 Fix assert for relay/bridge state change
When we added support for separate client tls certs on bridges in
a2bb0bfdd5 we forgot to correctly initialize this when changing
from relay to bridge or vice versa while Tor is running. Fix that
by always initializing keys when the state changes.

Fixes bug 2433.

Conflicts:

	src/or/config.c
2011-10-26 22:09:44 +02:00
Nick Mathewson d0a91386e5 Don't crash when accountingmax is set in non-server Tors
We use a hash of the identity key to seed a prng to tell when an
accounting period should end.  But thanks to the bug998 changes,
clients no longer have server-identity keys to use as a long-term seed
in accounting calculations.  In any case, their identity keys (as used
in TLS) were never never fixed.  So we can just set the wakeup time
from a random seed instead there.  Still open is whether everybody
should be random.

This patch fixes bug 2235, which was introduced in 0.2.2.18-alpha.

Diagnosed with help from boboper on irc.
2011-10-26 14:20:47 +02:00
Roger Dingledine 7c29b6996e Merge branch 'maint-0.2.1' into release-0.2.1 2011-10-26 07:39:01 -04:00
Nick Mathewson c5a3664f27 Fix zlib macro brokenness on osx with zlib 1.2.4 and higher.
From the code:
   zlib 1.2.4 and 1.2.5 do some "clever" things with macros.  Instead of
   saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory
   that nobody will care if the compile outputs a no-such-identifier warning.

   Sorry, but we like -Werror over here, so I guess we need to define these.
   I hope that zlib 1.2.6 doesn't break these too.

Possible fix for bug 1526.
2011-10-26 07:30:11 -04:00
Roger Dingledine c55f586e36 catch up on changes files 2011-10-24 02:34:29 -04:00
Roger Dingledine 6ef2e30c72 Merge branch 'maint-0.2.1' into release-0.2.1 2011-10-24 02:25:33 -04:00
Karsten Loesing ee545cd4cb Update to the October 2011 GeoIP database. 2011-10-13 10:13:40 -04:00
Karsten Loesing 679f617345 Update to the September 2011 GeoIP database. 2011-09-15 16:33:36 -04:00
Roger Dingledine 62ec584a30 Generate our ssl session certs with a plausible lifetime
Nobody but Tor uses certs on the wire with 2 hour lifetimes,
and it makes us stand out. Resolves ticket 4014.
2011-09-13 18:24:45 -04:00
Karsten Loesing c75ee94ab4 Update to the August 2011 GeoIP database. 2011-08-08 16:57:01 +02:00
Roger Dingledine 51d6e95023 update to the july 2011 geoip db 2011-07-07 13:28:36 -04:00
Nick Mathewson 021cf3f052 Merge branches 'cov217_021' and 'cid_450' into maint-0.2.1 2011-07-01 12:54:51 -04:00
Nick Mathewson 959da6b7f2 Use strlcpy in create_unix_sockaddr()
Using strncpy meant that if listenaddress were ever >=
sizeof(sockaddr_un.sun_path), we would fail to nul-terminate
sun_path.  This isn't a big deal: we never read sun_path, and the
kernel is smart enough to reject the sockaddr_un if it isn't
nul-terminated.  Nonetheless, it's a dumb failure mode.  Instead, we
should reject addresses that don't fit in sockaddr_un.sun_path.

Coverity found this; it's CID 428.  Bugfix on 0.2.0.3-alpha.
2011-07-01 12:54:24 -04:00
Nick Mathewson d25feadebb Fix insanely large stack_allocation in log_credential_status
I'm not one to insist on C's miserly stack limits, but allocating a
256K array on the stack is too much even for me.

Bugfix on 0.2.1.7-alpha.  Found by coverity.  Fixes CID # 450.
2011-07-01 12:38:05 -04:00
Robert Ransom 010b8dd4f6 Abandon rendezvous circuits on SIGNAL NEWNYM 2011-06-17 15:22:23 -04:00
Roger Dingledine bf4b819aae move to the june 1 2011 maxmind geoip db 2011-06-05 11:12:28 -04:00
Nick Mathewson f43aceb0f1 Fix typo in changes/bug2574. Thanks, rransom 2011-05-28 02:13:04 -04:00
Nick Mathewson ee72557d52 Merge branch 'bug2574' into maint-0.2.1 2011-05-28 02:07:48 -04:00
Nick Mathewson be76850995 Work correctly if your nameserver is ::1
We had all the code in place to handle this right... except that we
were unconditionally opening a PF_INET socket instead of looking at
sa_family.  Ow.

Fixes bug 2574; not a bugfix on any particular version, since this
never worked before.
2011-05-23 17:42:38 -04:00
Roger Dingledine f1c43a1e64 fold in new changes entries 2011-05-16 19:35:28 -04:00
Nick Mathewson 0d94f78705 rm files for changes merged in all of release021, release022, master 2011-05-16 16:17:35 -04:00
Nick Mathewson 4a3ef002e7 Merge branch 'maint-0.2.1' into release-0.2.1 2011-05-16 14:55:14 -04:00
Robert Ransom 987190c2bc Require that certain public keys have public exponent 65537 2011-05-16 14:28:46 -04:00
Robert Ransom 7571e9f1cb Check fetched rendezvous descriptors' service IDs 2011-05-16 14:07:24 -04:00
Roger Dingledine 109ba37d54 fold in latest changes entries 2011-05-14 00:21:12 -04:00