Nick Mathewson
b4e2d0607d
Merge commit 'sebastian/distcheck'
2010-08-03 10:07:57 -04:00
Nick Mathewson
05fa0a3ef6
Merge commit 'sebastian/rend-spec'
2010-08-03 09:16:24 -04:00
Nick Mathewson
ba24acbf1f
Merge commit 'karsten/dir-spec-fix'
2010-08-03 09:14:38 -04:00
Nick Mathewson
6d8b932659
Merge commit 'origin/maint-0.2.1'
2010-08-03 09:13:17 -04:00
Sebastian Hahn
8557f64220
Clarify that rend cookies shouldn't be reused
2010-08-03 14:48:17 +02:00
Sebastian Hahn
b8aa14a39b
Handle EHOSTUNREACH in errno_to_stream_end_reason()
...
We used to not recognize it and returned END_STREAM_REASON_MISC.
Instead, return END_STREAM_REASON_INTERNAL.
2010-08-03 14:03:36 +02:00
Karsten Loesing
b3b3c919c6
Fix copy-and-paste fail in dir-spec.txt.
2010-08-03 13:12:06 +02:00
Karsten Loesing
f206209abf
Update to the August 1 2010 Maxmind GeoLite Country database.
2010-08-03 13:04:09 +02:00
Sebastian Hahn
ddf5020ea8
Fix 'make distcheck'
...
We were leaving doc/config.log and src/or/micro-revision.i in
place during a make clean. Fix that.
2010-08-03 00:48:59 +02:00
Nick Mathewson
9265190b16
Merge branch 'bug1384'
2010-08-02 12:53:52 -04:00
Sebastian Hahn
a9d055c5c5
Fix a compile warning on OS X 10.6
...
Also update the changes file to contain a note on which bug was
fixed by this.
2010-08-02 18:45:17 +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
Chris Ball
73a4c0690e
Bug #919 : Don't rebind ports if we receive SIGHUP while hibernating.
2010-08-02 12:14:01 -04:00
Chris Ball
9ffa977981
Bug #928 : Disallow BridgeRelay 1 and ORPort 0 configuration
2010-08-02 12:04:04 -04:00
Chris Ball
600ba86f4a
Bug #1107 : Complain if PublishServerDescriptor receives 0 or 1 in a list
...
0 or 1 should only be passed as the sole argument. Warn for now, reject
in 0.2.3.x.
2010-08-02 12:02:06 -04:00
Nick Mathewson
fbfaa7bbc4
Merge commit 'sebastian/bug1776_v2'
2010-08-02 11:32:49 -04:00
Nick Mathewson
4504640b10
Merge branch 'bug1094_v2'
2010-08-02 11:11:02 -04:00
Chris Ball
1470eb2e91
Bug #1222 : Clarify new circuit after sleep notice
...
("Application request when we're believed to be offline." ->
"Application request when we haven't used client functionality lately.")
2010-07-31 16:58:49 -04:00
Nick Mathewson
fac272da31
If a router is hibernating, never vote that it is Running.
...
Also, clean up and comment some of the logic in
dirserv_set_router_is_running.
2010-07-31 16:33:45 -04:00
Nick Mathewson
49b0eb7a32
Fix up geoip unit tests to know about ??
2010-07-31 15:21:08 -04:00
Nick Mathewson
b175c584d5
Set up the geoip country table right even if not called normally
2010-07-31 15:21:08 -04:00
Nick Mathewson
4dd4d240b7
Move the "nowhereland" logic into geoip.c
2010-07-31 15:21:00 -04:00
Nick Mathewson
8fca6fb2aa
Make "Nowhere" explicitly listable in torrc.
...
We already had the country code ?? indicating an unknown country, so all we
needed to do to make unknown countries excludable was to make the ?? code
discoverable.
2010-07-31 15:00:06 -04:00
Nick Mathewson
883af78a9d
Clarify that cmd-line options override torrc options
2010-07-31 13:23:41 -04:00
Nick Mathewson
39378bf182
Warn when encounter the same (non-list) option twice in the same place
...
It's okay to get (say) a SocksPort line in the torrc, and then a
SocksPort on the command line to override it, and then a SocksPort via
a controller to override *that*. But if there are two occurrences of
SocksPort in the torrc, or on the command line, or in a single SETCONF
command, then the user is likely confused. Our old code would not
help unconfuse the user, but would instead silently ignore all but
the last occurrence.
This patch changes the behavior so that if the some option is passed
more than once to any torrc, command line, or SETCONF (each of which
coincidentally corresponds to a call to config_assign()), and the
option is not a type that allows multiple occurrences (LINELIST or
LINELIST_X), then we can warn the user.
This closes trac entry 1384.
2010-07-31 13:16:48 -04:00
Sebastian Hahn
9ca311f622
Allow using regular relays as bridges
2010-07-31 10:24:24 +02: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
Nick Mathewson
15424bf800
Document 20KB requirement in BandwidthRate documentation
...
This fixes the last suggestion of bug #1195 .
2010-07-30 18:00:43 -04:00
Nick Mathewson
7409929917
Merge commit 'karsten/rendspec-master'
2010-07-30 11:45:22 -04:00
Nick Mathewson
86a3b650b8
Add a changes file for Linus's makefile-var-exp branch.
2010-07-30 11:37:42 -04:00
Linus Nordberg
4ef609b886
Fix compilation issue in doc/Makefile.am on NetBSD
...
* doc/Makefile.am: Change $(VAR:MOD) to ${VAR:MOD} -- make(1) on
NetBSD substitutes '$(:x)' to 'x' rather than the empty string. This
bites us in doc/ when configured with `--disable-asciidoc'. Curly
braces should work in all implementations of make(1) but this patch
changes only the places where we use the VAR:MOD expansion.
2010-07-30 11:34:52 -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
Nick Mathewson
4727adf591
Merge commit 'linus/headers'
2010-07-29 21:54:46 -04:00
Nick Mathewson
a7b12978ce
Merge commit 'origin/maint-0.2.1'
2010-07-29 10:45:59 -04:00
Linus Nordberg
da49a7267f
Fix typos, make all \brief's conformant, end sentences with a period.
2010-07-28 17:42:33 +02:00
Sebastian Hahn
986dd554f4
Move the header for bandwidth_weight_rule_to_string into reasons.h
2010-07-27 10:00:47 +02:00
Sebastian Hahn
7b2b1b587d
Don't include crypto, compat and util.h in or.h
2010-07-27 10:00:46 +02:00
Sebastian Hahn
8cae0b6b1b
Simplify expression to list files for check-spaces
...
The tinytest* files went into src/test/.
2010-07-27 10:00:46 +02:00
Sebastian Hahn
02a57bbda5
Add the new header files to noinst_HEADERS
...
Also add a changes/ file.
2010-07-27 10:00:46 +02:00
Sebastian Hahn
05072723cb
Create routerparse.h
2010-07-27 10:00:46 +02:00
Sebastian Hahn
df9d42cef5
Create rephist.h
2010-07-27 10:00:46 +02:00
Sebastian Hahn
52e6e915fb
Create rendmid.h
2010-07-27 10:00:45 +02:00
Sebastian Hahn
b0cd4551ab
Create relay.h
2010-07-27 10:00:45 +02:00
Sebastian Hahn
cc060ea220
Create reasons.h
2010-07-27 10:00:45 +02:00
Sebastian Hahn
7bd8dee463
Create policies.h
2010-07-27 10:00:45 +02:00
Sebastian Hahn
f6852fe031
Create onion.h
2010-07-27 10:00:45 +02:00
Sebastian Hahn
af0c954bc5
Create ntmain.h
2010-07-27 10:00:39 +02:00
