Nick Mathewson
394a6bf4cd
Merge remote branch 'origin/maint-0.2.2'
2011-01-03 12:47:58 -05:00
Nick Mathewson
1e295666d9
Tweak GETINFO process/* code: no need to print an int as anything other than %d
2011-01-03 12:11:09 -05:00
Sebastian Hahn
9ecf133686
Fix compile wanrings revealed by gcc 4.5 on mingw
2010-12-27 09:47:41 +01:00
Roger Dingledine
d97be399c9
Correct a broken faq link in the INSTALL file
2010-12-22 00:54:29 -05:00
Nick Mathewson
00775ab4ed
Merge remote branch 'karsten/dirreq-stats-default'
...
Conflicts:
src/or/config.c
2010-12-21 16:01:00 -05:00
Nick Mathewson
95e21779a3
Merge remote branch 'origin/maint-0.2.2'
2010-12-21 15:53:32 -05:00
Nick Mathewson
e895919b17
Merge remote branch 'public/bug2060' into maint-0.2.2
2010-12-21 15:53:03 -05:00
Nick Mathewson
0a3b7f1471
Merge remote branch 'origin/maint-0.2.2'
2010-12-21 15:50:09 -05:00
Nick Mathewson
cdbd6d0fe8
Merge remote branch 'rransom/bug2190_the_hard_way' into maint-0.2.2
2010-12-21 15:48:14 -05:00
Roger Dingledine
c79427a992
Merge branch 'maint-0.2.2'
2010-12-19 22:08:42 -05:00
Roger Dingledine
c63c937465
Merge commit 'nickm/fix_security_bug_022' into maint-0.2.2
2010-12-16 17:24:11 -05:00
Nick Mathewson
1d0f8fe53c
Merge remote branch 'origin/maint-0.2.2'
2010-12-16 10:06:36 -05:00
Nick Mathewson
591f65dde6
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2010-12-16 10:05:07 -05:00
Karsten Loesing
3c3b1d14fd
Change gabelmoo's IP address and ports.
2010-12-16 13:28:30 +01:00
Nick Mathewson
b5e293afe6
Merge remote branch fix_security_bug_021 into fix_security_bug_022
...
Conflicts:
src/common/memarea.c
src/or/or.h
src/or/rendclient.c
2010-12-15 22:48:23 -05:00
Nick Mathewson
b0def605a5
Add a changelog entry
2010-12-15 22:35:07 -05:00
Nick Mathewson
a62b79dfc9
Merge remote branch 'origin/maint-0.2.2'
2010-12-14 14:13:56 -05:00
Nick Mathewson
ddfb398494
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
...
Conflicts:
src/config/geoip
2010-12-14 14:13:24 -05:00
Karsten Loesing
35148ba532
Update to the December 1 2010 Maxmind GeoLite Country database.
2010-12-08 17:59:40 +01:00
Nick Mathewson
4e9f9a4ee8
Merge remote branch 'origin/maint-0.2.2'
2010-12-07 11:37:14 -05:00
Nick Mathewson
f924fbf19f
Merge branch 'bug2081_followup_022' into maint-0.2.2
2010-12-07 11:35:49 -05:00
Nick Mathewson
5efe6f04c6
Reject relay versions older than 0.2.0.26-rc
...
This was the first version to cache the correct directory information.
Fixes bug 2156.
2010-12-07 11:35:32 -05:00
Nick Mathewson
8f31a9da43
revise bug2081_followup changelog
2010-12-07 11:27:51 -05:00
Nick Mathewson
3fc43debfb
Merge remote branch 'origin/maint-0.2.2'
2010-12-06 12:07:37 -05:00
Nick Mathewson
dc2f10bd81
Fix a bug in calculating wakeup time on 64-bit machines.
...
If you had TIME_MAX > INT_MAX, and your "time_to_exhaust_bw =
accountingmax/expected_bandwidth_usage * 60" calculation managed to
overflow INT_MAX, then your time_to_consider value could underflow and
wind up being rediculously low or high. "Low" was no problem;
negative values got caught by the (time_to_consider <= 0) check.
"High", however, would get you a wakeup time somewhere in the distant
future.
The fix is to check for time_to_exhaust_bw overflowing INT_MAX, not
TIME_MAX: We don't allow any accounting interval longer than a month,
so if time_to_exhaust_bw is significantly larger than 31*24*60*60, we
can just clip it.
This is a bugfix on 0.0.9pre6, when accounting was first introduced.
It fixes bug 2146, unless there are other causes there too. The fix
is from boboper. (I tweaked it slightly by removing an assignment
that boboper marked as dead, and lowering a variable that no longer
needed to be function-scoped.)
2010-12-06 12:01:32 -05:00
Nick Mathewson
bbadf07d16
Merge remote branch 'origin/maint-0.2.2'
2010-12-06 11:37:37 -05:00
Nick Mathewson
feffbce814
Add a missing ! to directory_fetches_from_authorities
...
The old logic would have us fetch from authorities if we were refusing
unknown exits and our exit policy was reject*. Instead, we want to
fetch from authorities if we're refusing unknown exits and our exit
policy is _NOT_ reject*.
Fixed by boboper. Fixes more of 2097. Bugfix on 0.2.2.16-alpha.
2010-12-06 11:36:01 -05:00
Nick Mathewson
0893793f01
Merge remote branch 'origin/maint-0.2.2'
2010-12-03 13:45:10 -05:00
Nick Mathewson
c0f1517d87
Don't crash when accountingmax is set in non-server Tors
...
We use a hash of the identity key to seed a prng to tell when an
accounting period should end. But thanks to the bug998 changes,
clients no longer have server-identity keys to use as a long-term seed
in accounting calculations. In any case, their identity keys (as used
in TLS) were never never fixed. So we can just set the wakeup time
from a random seed instead there. Still open is whether everybody
should be random.
This patch fixes bug 2235, which was introduced in 0.2.2.18-alpha.
Diagnosed with help from boboper on irc.
2010-12-03 13:37:13 -05:00
Karsten Loesing
076a688d76
Add ChangeLog entry and man page entry.
2010-12-03 16:47:52 +01:00
Nick Mathewson
520182579a
Merge remote branch 'origin/maint-0.2.2'
2010-12-02 13:21:09 -05:00
Nick Mathewson
ee8f451bf1
Fix a harmless off-by-one error in counting controller argument lengths
...
Bugfix on 0.1.1.1-alpha; found by boboper.
2010-12-02 13:19:21 -05:00
Roger Dingledine
fa1a419622
Merge branch 'maint-0.2.2'
2010-12-01 00:12:33 -05:00
Roger Dingledine
b259c08318
Merge branch 'maint-0.2.1' into maint-0.2.2
...
Conflicts:
doc/Makefile.am
2010-12-01 00:11:27 -05:00
Nick Mathewson
3ed7505dc5
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/relay.c
2010-11-30 19:23:40 -05:00
Nick Mathewson
ad87d6172b
fix changes file for 2210
2010-11-30 19:19:36 -05:00
Nick Mathewson
25b0fd8868
Revise comment on 2210 a little; clean up n_streams/num_streams confusion
...
Also add a changes file
2010-11-29 16:07:27 -05:00
Nick Mathewson
19019f26b0
Merge remote branch 'origin/maint-0.2.2'
2010-11-29 15:30:17 -05:00
Nick Mathewson
a5174b092e
Merge branch 'exitstats' into maint-0.2.2
2010-11-29 15:28:22 -05:00
Nick Mathewson
ae6b31aba9
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
2010-11-24 17:06:26 -05:00
Robert Ransom
de75afc556
Avoid dereferencing NULL if a bridge fails to build an ei descriptor.
...
Reported by an anonymous commenter on Trac.
2010-11-24 13:18:11 -08:00
Karsten Loesing
4fed43ab2e
Report only the top 10 ports in exit-port stats.
2010-11-24 08:45:05 +01:00
mingw-san
78df6404eb
Fix compilation with mingw and OpenSSL 0.9.8m+
2010-11-23 12:47:38 -05:00
Roger Dingledine
2d6ee53fb9
stop shipping doc/img and doc/website in the tarball
2010-11-23 00:03:50 -05:00
Nick Mathewson
12f3186719
Disable DirPort when BridgeRelay is set
2010-11-22 13:12:48 -05:00
Nick Mathewson
2af14b671d
Have authorities reject routers running verions susceptible to bug 1038.
2010-11-22 11:16:36 -05:00
Roger Dingledine
f54e75a2c6
prepare for our emergency openssl fix release
2010-11-21 16:59:42 -05:00
Nick Mathewson
cbd3745924
Merge remote branch 'origin/maint-0.2.2'
2010-11-21 14:34:22 -05:00
Nick Mathewson
2bd64f9e8f
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2010-11-21 14:33:11 -05:00
Nick Mathewson
a9d2148f53
Merge branch 'fix2204' into maint-0.2.1
2010-11-21 14:28:38 -05:00
