Commit Graph

10869 Commits

Author SHA1 Message Date
Peter Palfrader
f53b1c673c Merge branch 'debian-merge' into debian
* debian-merge: (33 commits)
  Forward port 06_add_compile_time_defaults
  New upstream version
  Bump version to 0.2.1.16-rc
  prepare changelog for 0.2.1.16-rc
  Better fix for 997.
  Revert "Backport fix for bug 997."
  tor-resolve: Don't automatically refuse .onion addresses.
  Backport fix for bug 997.
  Revise earlier check for correct IPv4 addr length to check for ==4.
  Check answer_len in the remap_addr case of process_relay_cell_not_open.
  update requirements to openssl 0.9.7
  Missing changelog entry about geoip
  Move and fix a changelog entry.  Noticed by optimist.
  Avoid a memory corruption problem related to "private" in DirPolicy.
  Update the rest of the geoip file.
  Update the geoip file
  Fix gprof bottlenecks on exit nodes found by Jacob.
  Do not report a node as a "chosen exit" when it is not in fact an exit.
  Make the second argument to routerset_contains_extendinfo const
  Don't attempt to log messages to a controller from a worker thread.
  ...
2009-06-20 13:08:43 +02:00
Peter Palfrader
6be66447e7 Forward port 06_add_compile_time_defaults 2009-06-20 13:00:41 +02:00
Peter Palfrader
ee2cdd1ddf New upstream version 2009-06-20 13:00:10 +02:00
Peter Palfrader
e4ff67aa0a Merge commit 'tor-0.2.1.16-rc' into debian-merge
* commit 'tor-0.2.1.16-rc': (31 commits)
  Bump version to 0.2.1.16-rc
  prepare changelog for 0.2.1.16-rc
  Better fix for 997.
  Revert "Backport fix for bug 997."
  tor-resolve: Don't automatically refuse .onion addresses.
  Backport fix for bug 997.
  Revise earlier check for correct IPv4 addr length to check for ==4.
  Check answer_len in the remap_addr case of process_relay_cell_not_open.
  update requirements to openssl 0.9.7
  Missing changelog entry about geoip
  Move and fix a changelog entry.  Noticed by optimist.
  Avoid a memory corruption problem related to "private" in DirPolicy.
  Update the rest of the geoip file.
  Update the geoip file
  Fix gprof bottlenecks on exit nodes found by Jacob.
  Do not report a node as a "chosen exit" when it is not in fact an exit.
  Make the second argument to routerset_contains_extendinfo const
  Don't attempt to log messages to a controller from a worker thread.
  Clean up a bit of C logic, and fix an erroneous warning.
  Consider *ListenAddress when warning about low ports and hibernation
  ...
2009-06-20 12:59:04 +02:00
Nick Mathewson
ac3dedacce Bump version to 0.2.1.16-rc 2009-06-20 01:14:07 -04:00
Roger Dingledine
428178dda3 prepare changelog for 0.2.1.16-rc 2009-06-19 11:09:45 -04:00
Karsten Loesing
f266ecbeec Better fix for 997. 2009-06-19 16:26:02 +02:00
Karsten Loesing
20883f5e83 Revert "Backport fix for bug 997."
This reverts commit 3847f54945.
2009-06-19 15:46:13 +02:00
Nick Mathewson
298dc95dfd tor-resolve: Don't automatically refuse .onion addresses.
If the Tor is running with AutomapHostsOnResolve set, it _is_
reasonable to do a DNS lookup on a .onion address.  So instead we make
tor-resolve willing to try to resolve anything.  Only if Tor refuses
to resolve it do we suggest to the user that resolving a .onion
address may not work.

Fix for bug 1005.
2009-06-18 11:08:10 -04:00
Karsten Loesing
3847f54945 Backport fix for bug 997.
Backporting 6a32beb and ca8708a.
2009-06-16 16:25:35 -04:00
Nick Mathewson
7f8a6c5e92 Revise earlier check for correct IPv4 addr length to check for ==4.
We need this to match the check in connection_ap_handshake_socks_resolved().

Found by optimist.
2009-06-16 16:12:06 -04:00
Roger Dingledine
845326317d Check answer_len in the remap_addr case of process_relay_cell_not_open.
Fix an edge case where a malicious exit relay could convince a
controller that the client's DNS question resolves to an internal IP
address. Bug found and fixed by "optimist"; bugfix on 0.1.2.8-beta.
2009-06-12 11:22:54 -04:00
Andrew Lewman
c50098ffc5 update requirements to openssl 0.9.7 2009-06-08 10:30:13 -04:00
Nick Mathewson
925d80ba0d Missing changelog entry about geoip 2009-06-08 00:00:54 -04:00
Nick Mathewson
8a02f61ad6 Move and fix a changelog entry. Noticed by optimist. 2009-06-07 00:03:27 -04:00
Nick Mathewson
20193fc7ab Avoid a memory corruption problem related to "private" in DirPolicy.
This is a posible fix for bug 996.
2009-06-05 19:41:40 -04:00
Karsten Loesing
48bf1d97ee Update the rest of the geoip file. 2009-06-04 00:47:58 +02:00
Nick Mathewson
0b23035e43 Update the geoip file 2009-06-03 17:35:41 -04:00
Nick Mathewson
b262e76563 Fix gprof bottlenecks on exit nodes found by Jacob.
Apparently all the stuff that does a linear scan over all the DNS
cache entries can get really expensive when your DNS cache is very
large.  It's hard to say how much this will help performance, since
gprof doesn't count time spent in OpenSSL or zlib, but I'd guess 10%.

Also, this patch removes calls to assert_connection_ok() from inside
the read and write callbacks, which are similarly unneeded, and a
little costlier than I'm happy with.

This is probably worth backporting to 0.2.0.
2009-06-03 13:52:03 -04:00
Nick Mathewson
c4c7dcd453 Do not report a node as a "chosen exit" when it is not in fact an exit.
Provide a useful warning when launch_circuit tries to make us use a
node we don't want to use.  Just give an info message when this is a
normal and okay situation.  Fix for logging issues in bug 984.
2009-05-31 19:15:36 -04:00
Nick Mathewson
e8ac2a8477 Make the second argument to routerset_contains_extendinfo const 2009-05-31 19:15:36 -04:00
Peter Palfrader
6190c81454 Update versioned build time dependency on debhelper 2009-05-31 13:18:53 +02:00
Peter Palfrader
83c5650178 Change debhelper compatibility version from 4 to 5 2009-05-31 11:15:04 +00:00
Peter Palfrader
38447cd4de Update Standards-Version 3.8.1
Update Standards-Version from 3.8.0 to 3.8.1.  No real changes required, we
already support nocheck in DEB_BUILD_OPTIONS since August 2004, and we already
create our var/run directory in the init script (tho we now no longer ship it
either - see above).
2009-05-31 10:43:38 +00:00
Peter Palfrader
aa278d3181 Remove /var/run/tor from package.
Stop shipping /var/run/tor in the package.  Only clean up permissions of
/var/run/tor in postinst if the directory actually exists.
2009-05-31 10:41:08 +00:00
Peter Palfrader
77bc85f047 Be quiet when creating /var/run/tor.
No longer inform the user if/when we re-create the /var/run/tor directory in
the init script.  With /var/run on tmpfs this is completely normal now so our
message was just noise.
2009-05-31 10:38:24 +00:00
Nick Mathewson
fd992deeea Don't attempt to log messages to a controller from a worker thread.
This patch adds a function to determine whether we're in the main
thread, and changes control_event_logmsg() to return immediately if
we're in a subthread.  This is necessary because otherwise we will
call connection_write_to_buf, which modifies non-locked data
structures.

Bugfix on 0.2.0.x; fix for at least one of the things currently
called "bug 977".
2009-05-30 18:16:24 -04:00
Peter Palfrader
db05c8bc43 Change build time dependency on gs to ghostscript. 2009-05-30 21:10:21 +02:00
Peter Palfrader
161a67eea5 New upstream version 2009-05-30 20:52:02 +02:00
Nick Mathewson
d66c379765 Clean up a bit of C logic, and fix an erroneous warning.
(Simplify "if (cond) return 1; return 0;" to "return cond;", and don't
give a warning when we start with accounting on but dirport off.)
2009-05-29 23:28:01 -04:00
Sebastian Hahn
e70fe116d3 Consider *ListenAddress when warning about low ports and hibernation
Tas (thanks!) noticed that when *ListenAddress is set, Tor would
still warn on startup when *Port is low and hibernation is active.
The patch parses all the *ListenAddress lines, and checks the
ports. Bugfix on 0.2.1.15-rc
2009-05-30 03:09:39 +02:00
Nick Mathewson
873faffb5a Two more spelling fix fixes. 2009-05-28 12:26:17 -04:00
Nick Mathewson
260de44313 Fixes to spelling fixes. Thanks, Roger! 2009-05-28 12:22:48 -04:00
Karsten Loesing
d49711e52c Fix unit tests that were broken after last fix of #932.
With the last fix of task 932 (5f03d6c), client requests are only added to
the history when they happen after the start of the current history. This
conflicts with the unit tests that insert current requests first (defining
the start of the client request history) followed by requests in the past.
The fix is to insert requests in chronological order in the unit tests.
2009-05-27 18:04:55 -04:00
Nick Mathewson
ec7e054668 Spell-check Tor. 2009-05-27 17:55:51 -04:00
Nick Mathewson
f0453c45c8 Spelling fixes in comments and strings 2009-05-27 16:36:13 -04:00
Nick Mathewson
1843f3936c Changelog entry for Karsten's bug-932 patch. 2009-05-27 14:11:38 -04:00
Karsten Loesing
02a417d4e0 Improve documentation for the last fix of bug 932. 2009-05-27 19:10:55 +02:00
Karsten Loesing
5f03d6c547 Fix bug 932 even more.
Ignore connections two hours after switching from bridge to relay or back.
2009-05-27 19:10:54 +02:00
Nick Mathewson
031ce86cd4 Add *.swp to .gitignore as vim's editor dropping. 2009-05-27 12:10:37 -04:00
Nick Mathewson
99c315a473 Use tor_socket_strerror in eventdns.c. Fixes bug 987. 2009-05-25 16:38:50 -04:00
Nick Mathewson
f334297d38 Bump version to 0.2.1.15-rc-dev. 2009-05-25 16:32:47 -04:00
Roger Dingledine
2f39eca28b bump to 0.2.1.15-rc 2009-05-25 13:23:08 -04:00
Roger Dingledine
a2c841d555 add the 0.2.1.14-rc blurb 2009-05-25 13:16:45 -04:00
Roger Dingledine
7d9567af2e clean up the 0.2.1.15-rc changelog 2009-05-25 13:14:58 -04:00
Nick Mathewson
1d002a25a2 Finish up the 0.2.1 version of the bug 957 fix.
Basically, all this means is downgrading our warning messages to debug
messages, since the bug workaround code here is adequate to stop the
bug.
2009-05-22 11:47:09 -04:00
phobos
678092750b fix a spelling mistake in config.c for "contries" 2009-05-22 01:26:17 -04:00
Nick Mathewson
34030a3d23 Possible fix for crash bug related to event timeouts. [Bug 957]
If we ever add an event, then set it, then add it again, there will be
now two pointers to the event in the event base.  If we delete one and
free it, the first pointer will still be there, and possibly cause a
crash later.

This patch adds detection for this case to the code paths in
eventdns.c, and works around it.  If the warning message ever
displays, then a cleverer fix is in order.

{I am not too confident that this *is* the fix, since bug 957 is very
tricky.  If it is, it is a bugfix on 0.2.0.}
2009-05-18 16:12:39 -04:00
Roger Dingledine
2fa5410218 Fix a memory leak when v3 directory authorities load their keys
and cert from disk. Bugfix on 0.2.0.1-alpha.
2009-05-17 02:04:59 -04:00
Nick Mathewson
c0515b307c Fix valgrind error when marking a descriptor as never-downloadable.
When we got a descriptor that we (as an authority) rejected as totally
bad, we were freeing it, then using the digest in its RAM to look up its
download status.  Caught by arma with valgrind.  Bugfix on 0.2.1.9-alpha.
2009-05-17 02:01:09 -04:00