51377ae1bb
Merge commit 'sebastian/mlockall'
2010-08-03 10:50:18 -04:00
b4e2d0607d
Merge commit 'sebastian/distcheck'
2010-08-03 10:07:57 -04:00
6d8b932659
Merge commit 'origin/maint-0.2.1'
2010-08-03 09:13:17 -04:00
f206209abf
Update to the August 1 2010 Maxmind GeoLite Country database.
2010-08-03 13:04:09 +02:00
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
9265190b16
Merge branch 'bug1384'
2010-08-02 12:53:52 -04:00
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
73a4c0690e
Bug #919 : Don't rebind ports if we receive SIGHUP while hibernating.
2010-08-02 12:14:01 -04:00
9ffa977981
Bug #928 : Disallow BridgeRelay 1 and ORPort 0 configuration
2010-08-02 12:04:04 -04:00
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
fbfaa7bbc4
Merge commit 'sebastian/bug1776_v2'
2010-08-02 11:32:49 -04:00
4504640b10
Merge branch 'bug1094_v2'
2010-08-02 11:11:02 -04:00
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
49b0eb7a32
Fix up geoip unit tests to know about ??
2010-07-31 15:21:08 -04:00
b175c584d5
Set up the geoip country table right even if not called normally
2010-07-31 15:21:08 -04:00
4dd4d240b7
Move the "nowhereland" logic into geoip.c
2010-07-31 15:21:00 -04:00
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
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
9ca311f622
Allow using regular relays as bridges
2010-07-31 10:24:24 +02:00
da49a7267f
Fix typos, make all \brief's conformant, end sentences with a period.
2010-07-28 17:42:33 +02:00
986dd554f4
Move the header for bandwidth_weight_rule_to_string into reasons.h
2010-07-27 10:00:47 +02:00
7b2b1b587d
Don't include crypto, compat and util.h in or.h
2010-07-27 10:00:46 +02:00
02a57bbda5
Add the new header files to noinst_HEADERS
...
Also add a changes/ file.
2010-07-27 10:00:46 +02:00
05072723cb
Create routerparse.h
2010-07-27 10:00:46 +02:00
df9d42cef5
Create rephist.h
2010-07-27 10:00:46 +02:00
52e6e915fb
Create rendmid.h
2010-07-27 10:00:45 +02:00
b0cd4551ab
Create relay.h
2010-07-27 10:00:45 +02:00
cc060ea220
Create reasons.h
2010-07-27 10:00:45 +02:00
7bd8dee463
Create policies.h
2010-07-27 10:00:45 +02:00
f6852fe031
Create onion.h
2010-07-27 10:00:45 +02:00
af0c954bc5
Create ntmain.h
2010-07-27 10:00:39 +02:00
69fcbbaa89
Create networkstatus.h
2010-07-27 07:58:16 +02:00
86d6bfe448
Create microdesc.h
2010-07-27 07:58:16 +02:00
0f1548ab18
Create main.h
2010-07-27 07:58:16 +02:00
a86f464f6b
Create hibernate.h
2010-07-27 07:58:16 +02:00
dc2f1666ff
Create dns.h
2010-07-27 07:58:16 +02:00
85f7d54418
Create dirvote.h
2010-07-27 07:58:16 +02:00
7d4c027fb0
Create dirserv.h
2010-07-27 07:58:16 +02:00
bec1c838ca
Create directory.h
2010-07-27 07:58:15 +02:00
98d1314c7e
Create cpuworker.h
2010-07-27 07:58:15 +02:00
0bfa34e1f6
Create control.h
2010-07-27 07:58:15 +02:00
0d33120c26
Create connection_or.h
2010-07-27 07:58:15 +02:00
78b6a4650b
Create connection_edge.h
2010-07-27 07:58:14 +02:00
2a74101f7a
Create connection.h
2010-07-27 07:58:14 +02:00
c4f8f1316e
Create config.h
2010-07-27 07:58:14 +02:00
3074d5a221
Create command.h
2010-07-27 07:58:14 +02:00
01c7b60a80
Create circuituse.h
2010-07-27 07:58:14 +02:00
174a88dd79
Create circuitlist.h
2010-07-27 07:58:13 +02:00
21155204c6
Create circuitbuild.h
2010-07-27 07:58:13 +02:00
34dfce0d82
Create buffers.h
2010-07-27 07:56:26 +02:00
Nick Mathewson
Karsten Loesing
Sebastian Hahn
Chris Ball
Linus Nordberg