Nick Mathewson
fe57aab283
Merge branch 'correct_halflife'
2010-04-13 13:37:33 -04:00
Nick Mathewson
96a0edf373
Rename CircPriorityHalflifeMsec to CircuitPriorityHalflifeMsec
...
Everything that accepted the 'Circ' name handled it wrong, so even now
that we fixed the handling of the parameter, we wouldn't be able to
set it without making all the 0.2.2.7..0.2.2.10 relays act wonky.
This patch makes Tors accept the 'Circuit' name instead, so we can
turn on circuit priorities without confusing the versions that treated
the 'Circ' name as occasion to act weird.
2010-04-13 13:29:30 -04:00
Nick Mathewson
7221d15acc
Merge commit 'origin/maint-0.2.1'
...
Conflicts:
src/or/test.c
2010-04-12 18:22:06 -04:00
Peter Palfrader
5e679acc72
testsuite: Prevent the main thread from starving the worker threads
2010-04-12 18:15:20 -04:00
Peter Palfrader
a02923122e
testsuite: Only free the main mutex when and if all the worker threads are done
2010-04-12 18:15:17 -04:00
Nick Mathewson
311aca5a34
Log bandwidth_weight_rule_t as a string, not an integer.
...
I'm adding this because I can never remember what stuff like 'rule 3'
means. That's the one where if somebody goes limp or taps out, the
fight is over, right?
2010-04-12 18:12:49 -04:00
Nick Mathewson
d888a8210f
Fix a bug in reading CircPriorityHalflife from consensus
...
When you mean (a=b(c,d)) >= 0, you had better not say (a=b(c,d)>=0).
We did the latter, and so whenever CircPriorityHalflife was in the
consensus, it was treated as having a value of 1 msec (that is,
boolean true).
2010-04-12 15:38:54 -04:00
Roger Dingledine
8aec982f91
Merge branch 'maint-0.2.1'
...
Conflicts:
ChangeLog
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
2010-04-03 22:05:02 -04:00
Roger Dingledine
0324d3b0ec
fetch relay descriptors from v3 authorities
2010-04-03 21:53:29 -04:00
Nick Mathewson
7b3cd4dceb
Merge commit 'sebastian/libxml'
2010-04-03 10:34:04 -04:00
Sebastian Hahn
80d9737e70
Fix a segfault when a client is hup'd.
...
We need to make sure we have an event_base in dns.c before we call
anything that wants one. Make sure we always have one in dns_reset()
when we're a client. Fixes bug 1341.
2010-04-03 12:31:59 +02:00
Roger Dingledine
51d084f805
fold in the recent changelog entries
2010-04-02 15:33:38 -04:00
Nick Mathewson
927425150b
Merge branch 'asprintf'
2010-04-02 12:30:46 -04:00
Sebastian Hahn
a8089027e2
Mention libxml2-utils in our asciidoc dependencies
...
Zax from #tor noticed that while we list docbook-xsl and docbook-xml
in our helpful error text when making the docs fails, we forgot to
also list libxml2-utils. Let's add that.
2010-03-30 14:53:30 +02:00
Sebastian Hahn
cae769d646
Segfault less during consensus generation without params
...
If no authority votes on any params, Tor authorities segfault when
trying to make a new consensus from the votes. Let's change that.
2010-03-29 22:25:37 +02:00
Nick Mathewson
28cda33299
Add a missing NL to dir-spec.
...
Found by Oğuz
2010-03-21 12:45:01 -04:00
Roger Dingledine
fe3380609e
In the glorious future, all relays cache dir info.
...
Now if you're a published relay and you set RefuseUnknownExits, even
if your dirport is off, you'll fetch dir info from the authorities,
fetch it early, and cache it.
In the future, RefuseUnknownExits (or something like it) will be on
by default.
2010-03-16 04:02:18 -04:00
Roger Dingledine
6b7e5eb5f1
give us a blurb; add stanza to the releasenotes
2010-03-16 00:44:30 -04:00
Roger Dingledine
94dccce3fa
bump to 0.2.1.25
...
it's perfect, let's ship it
2010-03-15 18:08:29 -04:00
Nick Mathewson
03b9c2cb90
fix some dangling refs in dirspec
2010-03-15 15:41:59 -04:00
Nick Mathewson
f8d176d1b9
Clarify title of section 3.3
2010-03-13 14:54:05 -05:00
Roger Dingledine
1108358e96
let people test the RefuseUnknownExits idea
2010-03-10 22:43:23 -05:00
Nick Mathewson
2d29c7be2d
Document possibility of "unknown" version state.
...
reported by atagar; fixes bug 1289.
2010-03-09 00:08:38 -05:00
Roger Dingledine
10a6b30bee
blurbs for recent alphas
2010-03-08 23:09:49 -05:00
Sebastian Hahn
fca673bcd3
Don't require asciidoc when building Tor from a tarball
...
If asciidoc is required, the user receives an error message telling
them about the --disable-asciidoc configure switch and the build
breaks.
2010-03-09 03:00:59 +01:00
Roger Dingledine
4d7d1027ae
fix the tor-exit-notice.html file (bug 1295)
2010-03-08 20:40:21 -05:00
Roger Dingledine
db135e92b4
bump to 0.2.2.10-alpha-dev
...
now's your chance to destabilize it
2010-03-08 00:40:00 -05:00
Roger Dingledine
81b84c0b01
prepare 0.2.2.10-alpha for release
2010-03-07 00:13:12 -05:00
Roger Dingledine
407a9d4193
Merge branch 'maint-0.2.1'
...
Conflicts:
ChangeLog
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
2010-03-06 22:46:39 -05:00
Roger Dingledine
841351e612
clean up the 0.2.1.25 changelog
2010-03-06 22:39:34 -05:00
Nick Mathewson
ac8b8bca11
Clarify that CRLF means "A CR then an LF". Explain what those are.
...
Apparently this is not as obvious as I thought.
2010-03-05 17:00:42 -05:00
Roger Dingledine
625963d92a
commit my annotations while i was hunting down the host order bug
2010-03-05 16:04:01 -05:00
Roger Dingledine
368ca2a646
Merge branch 'master' of ssh://git@git-rw.torproject.org/tor
2010-03-05 14:25:08 -05:00
Nick Mathewson
8719748767
Merge commit 'sebastian/manpage'
2010-03-04 23:30:53 -05:00
Nick Mathewson
eb2e56ad3c
Merge commit 'origin/maint-0.2.1'
...
Conflicts:
src/or/config.c
src/or/test.c
2010-03-04 18:44:31 -05:00
Nick Mathewson
3ff092391b
Apply Roger's bug 1269 fix.
...
From http://archives.seul.org/tor/relays/Mar-2010/msg00006.html :
As I understand it, the bug should show up on relays that don't set
Address to an IP address (so they need to resolve their Address
line or their hostname to guess their IP address), and their
hostname or Address line fails to resolve -- at that point they'll
pick a random 4 bytes out of memory and call that their address. At
the same time, relays that *do* successfully resolve their address
will ignore the result, and only come up with a useful address if
their interface address happens to be a public IP address.
2010-03-04 18:37:40 -05:00
Nick Mathewson
b3ec39af8f
Merge remote branch 'mikeperry/bwweight-smartlistfix'
2010-03-04 00:13:23 -05:00
Mike Perry
2b5e1d3636
Woops, forgot the second warn.
...
Also, differentiate the two log messages.
2010-03-03 21:02:01 -08:00
Sebastian Hahn
f3003d588f
Add proposal 170 "Configuration options regarding circuit building"
2010-03-03 23:56:59 -05:00
Roger Dingledine
82a5ef1f7f
Merge commit 'mikeperry/bwweight-smartlistfix'
2010-03-03 22:36:47 -05:00
Mike Perry
97eec84f4b
Demote warn to info, since it can happen.
...
I still feel like we should investigate this case. It seems odd.
2010-03-03 17:35:06 -08:00
Peter Palfrader
9d3a985a83
Note an exception to when we use OutboundBindAddress
2010-03-02 12:58:50 -05:00
Nick Mathewson
404af59ed5
Backport fix for time-goes-forward test. Fix bug 1267
2010-03-02 10:40:21 -05:00
Sebastian Hahn
4db5e7ae76
Add configure switch to disable use of asciidoc
...
Also break the build if that switch isn't used and asciidoc isn't
available.
2010-03-01 05:02:27 +01:00
Sebastian Hahn
0cd1b499b4
Simplify asciidoc-helper
...
We don't need sed for our string manipulation, so let's get rid of
it. Suggested by weasel.
2010-03-01 04:07:55 +01:00
Sebastian Hahn
f9de12b864
Ship the asciidoc-helper file in our tarballs
...
Otherwise, the build process breaks when one of the .1.txt gets
a new mtime. Suggested by weasel.
2010-03-01 04:07:55 +01:00
Nick Mathewson
47e919424d
Tweak users of snprintf to use asprintf where appropriate
2010-02-28 21:46:50 -05:00
Nick Mathewson
897b0ebbac
better handle the case where *strp is in asprintf args
2010-02-28 21:46:46 -05:00
Nick Mathewson
9caecc1e48
Merge branch 'fix_routerparse_bug'
2010-02-28 13:48:05 -05:00
Nick Mathewson
da220157a9
Update copyright dates for files not in maint-0.2.1
2010-02-27 17:19:00 -05:00