Commit Graph

3056 Commits

Author SHA1 Message Date
Nick Mathewson
2b4ed1d07e Merge remote branch 'origin/maint-0.2.2'
Conflicts:
	configure.in
2010-11-11 13:59:18 -05:00
Sebastian Hahn
fcdf1470c0 Remove everything related to os x expert package
We decided to no longer ship expert packages for OS X because they're a
lot of trouble to keep maintained and confuse users. For those who want
a tor on OS X without Vidalia, macports is a fine option. Alternatively,
building from source is easy, too.

The polipo stuff that is still required for the Vidalia bundle build can
now be found in the torbrowser repository,
git://git.torproject.org/torbrowser.git.
2010-11-10 04:04:29 +01:00
Nick Mathewson
1fb342dfab Merge branch 'loggranularity' 2010-11-08 12:40:33 -05:00
Karsten Loesing
ed45bc198f Fix log granularity based on Nick's comments.
Instead of rejecting a value that doesn't divide into 1 second, round to
the nearest divisor of 1 second and warn.

Document that the option only controls the granularity written by Tor to a
file or console log. It does not (for example) "batch up" log messages to
affect times logged by a controller, times attached to syslog messages, or
the mtime fields on log files.
2010-11-08 17:38:59 +01:00
Nick Mathewson
8c837db38f Merge branch 'nodes' 2010-10-13 16:04:25 -04:00
Nick Mathewson
64535a401b Merge remote branch 'origin/maint-0.2.2' 2010-10-04 12:58:35 -04:00
Nick Mathewson
1fa50c778c Clarify PublishServerDescriptor even more 2010-10-04 12:58:20 -04:00
Karsten Loesing
8c5ba9388b Make logging resolution configurable.
Implements enhancement 1668.
2010-10-04 08:15:18 +02:00
Nick Mathewson
f9ea242aca Implement node-based router family code
Also, make the NodeFamily option into a list of routersets.  This
lets us git rid of router_in_nickname_list (or whatever it was
called) without porting it to work with nodes, and also lets people
specify country codes and IP ranges in NodeFamily
2010-10-01 18:14:27 -04:00
Robert Ransom
8d87040e13 Describe BridgeRelay and PublishServerDescriptor more correctly. 2010-09-30 23:43:19 -07:00
Nick Mathewson
1b2120654c Merge remote branch 'sebastian/fw-helper-manpage' 2010-09-30 22:24:18 -04:00
Roger Dingledine
5b7669130b renumber, clean whitespace 2010-09-30 22:04:52 -04:00
Roger Dingledine
6de26d2bc8 give steven's everybody-a-bridge proposal a number 2010-09-30 22:04:52 -04:00
Steven Murdoch
60842424ae Add comments from nickm and arma, from IRC 2010-09-30 22:04:52 -04:00
Steven Murdoch
2ba53aca76 Add algorithm and rationale for performance measurement 2010-09-30 22:04:52 -04:00
Steven Murdoch
df3911ded8 In the migration plan, mention how to prevent overloading the bridge authority 2010-09-30 22:04:52 -04:00
Steven Murdoch
ac55247350 Integrate more feedback from IRC
- For now we are only talking about moving clients to be bridges

- Some questions on how we should inform users
2010-09-30 22:04:52 -04:00
Steven Murdoch
d3d411533c Add some open questions, and mention Roger's idea about asking for consent via email 2010-09-30 22:04:52 -04:00
Steven Murdoch
60d416a564 Note that we only can't handle automatic demotion. Users can always change their state manually. 2010-09-30 22:04:51 -04:00
Steven Murdoch
b112ecbcd9 Change "server" to "relay", so as to match existing terminology 2010-09-30 22:04:51 -04:00
Steven Murdoch
6008fcf863 Start idea xxx-automatic-node-promotion
- Initial draft of overview and motivation
- Start of design
2010-09-30 22:04:51 -04:00
Sebastian Hahn
d67bdddec5 Build the tor-fw-helper manpage
So far we just had the asciidoc manpage, but didn't build it.
2010-09-30 23:13:24 +02:00
Steven Murdoch
a6dc00fa75 Start tor-fw-helper in the background, and log whatever it outputs 2010-09-30 11:40:37 -04:00
Jacob Appelbaum
3eaa9a376c Changes to tor-fw-helper, some based on Nick's review
* MINIUPNPC rather than the generic UPNP
 * Nick suggested a better abstraction model for tor-fw-helper
 * Fix autoconf to build with either natpmp or miniupnpc
 * Add AM_PROG_CC_C_O to fix automake complaint
 * update spec to address nickm's concern
 * refactor nat-pmp to match upnp state
 * we prefer tor_snprintf to snprintf
 * link properlty for tor_snprintf
 * rename test_commandline_options to log_commandline_options
 * cast this uint as an int
 * detect possible FD_SETSIZE errors
 * make note about future enhancements for natpmp
 * add upnp enhancement note
 * ChangeLog entry
 * doxygen and check-spaces cleanup
 * create tor-fw-helper.1.txt
2010-09-30 11:39:34 -04:00
Jacob Appelbaum
9cc76cf005 First implementation of tor-fw-helper.
tor-fw-helper is a command-line tool to wrap and abstract various
firewall port-forwarding tools.

This commit matches the state of Jacob's tor-fw-helper branch as of
23 September 2010.

  (commit msg by Nick)
2010-09-30 11:37:53 -04:00
Roger Dingledine
355fc63790 Merge branch 'maint-0.2.2' 2010-09-29 17:21:43 -04:00
Roger Dingledine
48cd096276 Merge commit 'mikeperry/bug1739' into maint-0.2.2 2010-09-29 17:17:59 -04:00
Mike Perry
c5b5643965 Send control port events for timeouts.
We now differentiate between timeouts and cutoffs by the REASON string and
the PURPOSE string.
2010-09-29 11:46:36 -07:00
Nick Mathewson
f3e8bc391a Remove the has_old_dnsworkers flag. 2010-09-28 23:37:45 -04:00
Nick Mathewson
73d93c033d Autodetect the number of CPUs when possible if NumCPUs==0
This is needed for IOCP, since telling the IOCP backend about all
your CPUs is a good idea.  It'll also come in handy with asn's
multithreaded crypto stuff, and for people who run servers without
reading the manual.
2010-09-28 14:42:21 -04:00
Nick Mathewson
c612ddee17 Add a new option to enable/disable IOCP support 2010-09-28 14:01:45 -04:00
Roger Dingledine
a467bf5fbb a dir-spec entry for refuseunknownexits
plus quiet a log line
2010-09-27 18:32:09 -04:00
Nick Mathewson
7c83b0a2a2 Merge branch 'refuseunknown' into maint-0.2.2 2010-09-27 17:15:57 -04:00
Sebastian Hahn
8ac2de5ab9 Add RefuseUnknownExits to the manpage 2010-09-27 17:15:41 -04:00
Nick Mathewson
1cbdbff961 Merge remote branch 'mikeperry/bug1952-merge' into maint-0.2.2 2010-09-27 12:17:41 -04:00
Mike Perry
7af0aa25d8 Update dir-spec.txt with new weight constraints. 2010-09-27 09:11:55 -07:00
Nick Mathewson
c8e1538a0b Merge remote branch 'sebastian/continuation' 2010-09-24 13:43:55 -04:00
John Brooks
fb34c66e83 Correct default for RendPostPeriod in docs 2010-09-21 01:05:47 -04:00
Roger Dingledine
0ac67bf3c3 perconnbwrate and perconnbwburst consensus params 2010-09-16 00:17:39 -04:00
Roger Dingledine
277295efc1 circwindow consensus param != CircWindow
aka update dir-spec.txt to reflect reality
2010-09-15 17:55:30 -04:00
Nick Mathewson
c18bcc8a55 Merge branch 'bug1184' 2010-09-15 14:20:28 -04:00
Nick Mathewson
69508d04a2 tor-spec.txt tweaks from arma 2010-09-15 13:08:44 -04:00
Nick Mathewson
2be5effe9a Initial oprofile instructions based on original by weasel. 2010-09-12 19:37:04 -04:00
Sebastian Hahn
1dab6cf4cb Document multiline options in the manpage 2010-09-11 01:44:20 +02:00
Nick Mathewson
2804c6b7ff Merge commit 'karsten/rendspec-koryk' 2010-08-25 16:44:37 -04:00
Nick Mathewson
a509dbba50 Merge commit 'karsten/dirbytes2'
Conflicts:
	src/or/rephist.h
2010-08-18 10:06:14 -04:00
Karsten Loesing
db94b7f46e Count bytes we spend on answering directory requests. 2010-08-18 13:54:41 +02:00
Karsten Loesing
8e8a34eb74 Add koryk's modifications to rend-spec. 2010-08-17 10:02:07 +02:00
Nick Mathewson
9bcea4a8ef Merge commit 'sebastian/misc-reason' 2010-08-15 21:27:32 -04:00
Nick Mathewson
a5d8ed7990 Merge commit 'karsten/stats-manpage' 2010-08-15 20:23:50 -04:00