Nick Mathewson
a4b7525c3c
Fix a crash bug in tor_assert(md->held_by_node)
...
The fix is to turn held_by_node into a reference count.
Fixes bug 4118; bugfix on 0.2.3.1-alpha.
2011-09-28 13:40:21 -04:00
Roger Dingledine
e98c9a1bf6
if we have enough usable guards, just pick one
...
we don't need to check whether we don't have enough guards right after
concluding that we do have enough.
slight efficiency fix suggested by an anonymous fellow on irc.
2011-09-27 17:35:31 -04:00
Roger Dingledine
88516f65c9
Merge branch 'maint-0.2.2'
2011-09-24 22:47:53 -04:00
Roger Dingledine
1c2e4d1336
trivial whitespace changes, take two
2011-09-24 22:46:21 -04:00
Nick Mathewson
c42a1886cc
Trivial whitespace fixes
2011-09-24 22:15:59 -04:00
Nick Mathewson
ccceefe136
Add a changes file for Tom Lowenthal's patch for #4063
2011-09-24 22:15:13 -04:00
Tom Lowenthal
5835acc6f9
Ticket #4063 - change circuit build timeout log entries from NOTICE to INFO
2011-09-24 22:12:40 -04:00
Nick Mathewson
5a8dcca8f7
Merge branch 'feature3630-rebased'
2011-09-22 15:54:40 -04:00
Nick Mathewson
fee094afcd
Fix issues in 3630 patch noted by Karsten
2011-09-22 15:07:35 -04:00
Nick Mathewson
a8297a301e
Changes file for feature3630
2011-09-22 15:07:35 -04:00
Nick Mathewson
41dfc4c19c
Make bufferevents work with TokenBucketRefillInterval
2011-09-22 15:07:34 -04:00
Nick Mathewson
052b95e2f1
Refactor connection_bucket_refill(_helper) to avoid roundoff
...
We were doing "divide bandwidth by 1000, then multiply by msec", but
that would lose accuracy: instead of getting your full bandwidth,
you'd lose up to 999 bytes per sec. (Not a big deal, but every byte
helps.)
Instead, do the multiply first, then the division. This can easily
overflow a 32-bit value, so make sure to do it as a 64-bit operation.
2011-09-22 15:07:34 -04:00
Nick Mathewson
1e61184628
Make documentation for TokenBucketRefillInterval match its behavior
2011-09-22 15:07:34 -04:00
Nick Mathewson
0721abbf1b
Move around check for TokenBucketRefillInterval; disallow changes to it
2011-09-22 15:07:34 -04:00
Florian Tschorsch
6b1d8321ae
New torrc option to allow bucket refill intervals of less than 1 sec
...
Implements bug3630.
2011-09-22 15:07:23 -04:00
Nick Mathewson
40288e1e66
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-09-20 10:25:56 -04:00
Nick Mathewson
bfa75f70bb
changes file for bug 4059
2011-09-20 09:56:26 -04:00
Mansour Moufid
1ba90ab655
Fix a potentially useless integer overflow check.
...
GCC 4.2 and maybe other compilers optimize away unsigned integer
overflow checks of the form (foo + bar < foo), for all bar.
Fix one such check in `src/common/OpenBSD_malloc_Linux.c'.
2011-09-20 09:52:44 -04:00
Roger Dingledine
0c0345a3d0
Merge branch 'maint-0.2.2'
2011-09-15 16:35:26 -04:00
Roger Dingledine
ac7b6c508d
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-09-15 16:34:47 -04:00
Karsten Loesing
679f617345
Update to the September 2011 GeoIP database.
2011-09-15 16:33:36 -04:00
Nick Mathewson
2394c74017
Log errno on listener socket creation failure.
...
This may help diagnose bug 4027.
2011-09-15 09:51:48 -04:00
Roger Dingledine
6a799c10ee
bump to 0.2.3.4-alpha-dev
2011-09-13 22:04:47 -04:00
Roger Dingledine
5f4f727d58
slight tweak to unify things
2011-09-13 20:26:32 -04:00
Roger Dingledine
0b0f7d792c
bump to 0.2.3.4-alpha
2011-09-13 19:59:06 -04:00
Roger Dingledine
c133d71bdd
a blurb for 0.2.3.4-alpha
2011-09-13 19:56:59 -04:00
Roger Dingledine
befaa435bd
forward-port the 0.2.2.33 changelog
2011-09-13 19:19:38 -04:00
Roger Dingledine
1fcaeb6092
Merge branch 'maint-0.2.2'
2011-09-13 18:32:00 -04:00
Roger Dingledine
4a351b4b9e
Merge branch 'maint-0.2.1' into maint-0.2.2
...
Conflicts:
src/or/main.c
src/or/router.c
2011-09-13 18:27:13 -04:00
Roger Dingledine
62ec584a30
Generate our ssl session certs with a plausible lifetime
...
Nobody but Tor uses certs on the wire with 2 hour lifetimes,
and it makes us stand out. Resolves ticket 4014.
2011-09-13 18:24:45 -04:00
Roger Dingledine
1e1cc43b57
Merge branch 'maint-0.2.2'
2011-09-12 05:54:55 -04:00
Karsten Loesing
d679ef623f
Update to the September 2011 GeoIP database.
2011-09-12 11:43:51 +02:00
Nick Mathewson
386966142e
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-09-11 16:25:14 -04:00
Roger Dingledine
cca806c56c
fix whitespace (two-space indent)
2011-09-11 01:33:04 -04:00
Robert Ransom
8ea6d29fe4
Demote 'INTRODUCE2 cell is too {old,new}' message to info level
2011-09-10 21:56:05 -04:00
Robert Ransom
b10735903b
Demote HS 'replay detected' log message for DH public keys to info level
2011-09-10 21:56:05 -04:00
Robert Ransom
07a5cf285a
Describe rend_service_descriptor_t more completely
2011-09-10 19:09:01 -04:00
Robert Ransom
aa900b17ca
Describe rend_intro_point_t more completely
2011-09-10 19:05:53 -04:00
Nick Mathewson
a8838a86fe
Changes file for bug3936 changes
2011-09-10 17:51:38 -04:00
Fabian Keil
c6f6b567e0
Stop parse_client_port_config() from misinterpreting FooListenAddress and FooPort in legacy syntax
...
Previously the FooPort was ignored and the default used instead,
causing Tor to bind to the wrong port if FooPort and the default
port don't match or the CONN_TYPE_FOO_LISTENER has no default port.
Fixes #3936 .
2011-09-10 17:48:37 -04:00
Fabian Keil
087e0569c3
Fix whitespace in parse_client_port_config()
2011-09-10 17:48:36 -04:00
Nick Mathewson
35f9be7d04
Merge remote-tracking branch 'rransom-tor/typo-fix-ohkah8Ah'
2011-09-10 17:45:27 -04:00
Robert Ransom
c621e52883
Fix log message typo.
2011-09-10 16:15:52 -04:00
Roger Dingledine
ae2856b6f6
start an 0.2.3.4-alpha changelog
2011-09-09 13:51:15 -04:00
Nick Mathewson
a41f1fc612
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
configure.in
src/or/circuitbuild.c
2011-09-09 12:58:12 -04:00
Nick Mathewson
b0695c11eb
Merge remote-tracking branch 'public/gcc-295-fix' into maint-0.2.2
2011-09-09 12:54:27 -04:00
Nick Mathewson
4467799f45
Merge remote-tracking branch 'public/enhance_replay_detection' into maint-0.2.2
2011-09-09 12:53:45 -04:00
Nick Mathewson
cb9226bcdb
Check for replays in PK-encrypted part of intro cell, not just in the g^x value
2011-09-09 12:49:47 -04:00
Nick Mathewson
45ca0d2bfa
Add changes file for bsd4 fixes
2011-09-09 10:41:06 -04:00
Nick Mathewson
d3ff167e09
Fix whitespace issues in patches merged today so far
2011-09-07 20:26:58 -04:00