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
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
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
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
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
