Nick Mathewson
8c2affe637
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/config.c
src/or/cpuworker.c
2010-11-15 14:14:13 -05:00
Nick Mathewson
3d7772ece3
Merge remote branch 'karsten/enhancement1883'
2010-11-12 14:13:17 -05:00
Nick Mathewson
223fc208f6
Split long lines in configure.in and Makefile.am files
...
Having very long single lines with lots and lots of things in them
tends to make files hard to diff and hard to merge. Since our tools
are one-line-at-a-time, we should try to construct lists that way too,
within reason.
This incidentally turned up a few headers in configure.in that we were
for some reason searching for twice.
2010-11-11 14:22:48 -05:00
Sebastian Hahn
556a1b9e45
Change Natd into NATD in our options.
...
Breaking this out of the last commit because this might be more
controversial.
2010-11-10 15:48:26 +01:00
Karsten Loesing
423c2a7a27
Add GeoIP file digest to extra-info descriptor.
2010-11-09 09:42:36 +01:00
Karsten Loesing
8c5ba9388b
Make logging resolution configurable.
...
Implements enhancement 1668.
2010-10-04 08:15:18 +02: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
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
Roger Dingledine
a467bf5fbb
a dir-spec entry for refuseunknownexits
...
plus quiet a log line
2010-09-27 18:32:09 -04:00
Mike Perry
7af0aa25d8
Update dir-spec.txt with new weight constraints.
2010-09-27 09:11:55 -07: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
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
Sebastian Hahn
2d8db2aacb
Fix url in rend-spec
...
Fixes bug 1822
2010-08-12 02:40:19 +02:00
Sebastian Hahn
28962ecae8
Fix a typo in control-spec
2010-08-12 02:38:58 +02:00
Sebastian Hahn
161b275028
Retry streams that ended with NOROUTE error
...
Also add the NOROUTE reason to control-spec.
2010-08-04 00:51:39 +02:00
Nick Mathewson
cafd868a78
Clarify that implementation is for discussion of implementation
2010-08-03 14:25:07 -04:00
Nick Mathewson
d5abd0b43e
Add proposal 174 from Ian Goldberg: Optimistic Data for Tor: Server Side
2010-08-03 14:23:51 -04:00
Nick Mathewson
9d317e9bb4
Bless two proposals from Damian Johnson as 172 and 173.
...
(Leaving a gap for the proposal Jake blessed as 171.)
2010-08-03 13:23:34 -04:00
Sebastian Hahn
4e3373f7fe
Make tor-spec wording easier to understand
2010-08-03 17:28:19 +02:00
Sebastian Hahn
150ed553df
Introduce END_STREAM_REASON_NOROUTE
2010-08-03 16:46:28 +02:00
Nick Mathewson
05fa0a3ef6
Merge commit 'sebastian/rend-spec'
2010-08-03 09:16:24 -04:00
Sebastian Hahn
8557f64220
Clarify that rend cookies shouldn't be reused
2010-08-03 14:48:17 +02:00
Karsten Loesing
b3b3c919c6
Fix copy-and-paste fail in dir-spec.txt.
2010-08-03 13:12:06 +02:00
Nick Mathewson
c4b83b2177
Clarify that TRUNCATE behavior isn't as-intended
...
In tor-spec.txt, instead of saying "nodes may X" instead say "Current
nodes do X; this is nonconformant. Clients should watch out for that."
Based on observations by wanoskarnet.
2010-08-02 12:28:25 -04:00
Nick Mathewson
6f45101327
Clear cell queues when marking or truncating a circuit.
...
At best, this patch helps us avoid sending queued relayed cells that
would get ignored during the time between when a destroy cell is
sent and when the circuit is finally freed. At worst, it lets us
release some memory a little earlier than it would otherwise.
Fix for bug #1184 . Bugfix on 0.2.0.1-alpha.
2010-07-30 18:55:24 -04:00
Karsten Loesing
1cf6da821c
Add two authoritzation protocols to rend-spec.txt.
2010-07-30 10:33:28 +02:00
Karsten Loesing
9ecb64c44d
Clean up Section 1 of rend-spec.txt.
2010-07-30 10:33:28 +02:00
Karsten Loesing
6e4c06598f
Interchange sections 1.2 and 1.3.
2010-07-30 10:29:14 +02:00
Karsten Loesing
f6e0dc2a6e
Rename all RELAY_* cell types to RELAY_COMMAND_*.
2010-07-30 10:28:07 +02:00