Nick Mathewson
30b3475e6d
Bump copyright statements to 2011 (0.2.2)
2011-01-03 11:52:09 -05:00
Nick Mathewson
f1de329e78
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
...
Conflicts:
src/common/test.h
src/or/test.c
2011-01-03 11:51:17 -05:00
Nick Mathewson
1a07348a50
Bump copyright statements to 2011
2011-01-03 11:50:39 -05:00
Robert Ransom
305ba230fe
Don't throw away incomplete SOCKS proxy responses.
...
Introduced in 9796b9bfa6
2010-12-29 05:55:45 -08:00
Robert Ransom
524fdeeb1e
Use evbuffer_pullup properly in fetch_from_evbuffer_socks_client.
...
evbuffer_pullup does nothing and returns NULL if the caller asks it to
linearize more data than the buffer contains.
Introduced in 9796b9bfa6
2010-12-29 05:52:09 -08:00
Sebastian Hahn
59a3d536d8
Fix compile without warnings on OS X 10.6
2010-12-27 11:37:16 +01:00
Sebastian Hahn
9ecf133686
Fix compile wanrings revealed by gcc 4.5 on mingw
2010-12-27 09:47:41 +01:00
Sebastian Hahn
da91900135
Disable stats requiring geoip info if we have none
...
In other parts of the code we will otherwise attempt to collect these
statistics, and that will lead to crashes.
2010-12-22 08:34: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
Nick Mathewson
029ca804b2
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2010-12-21 15:48:06 -05:00
Nick Mathewson
69771bb5fc
Merge remote branch 'public/bug2190_021' into maint-0.2.1
2010-12-21 15:44:50 -05:00
Roger Dingledine
601b6a8099
remove duplicate (wrong) changelog entry
2010-12-20 09:14:11 -05:00
Roger Dingledine
539814e0c9
forward-port the two recent changelog entries
2010-12-20 07:49:22 -05:00
Roger Dingledine
c79427a992
Merge branch 'maint-0.2.2'
2010-12-19 22:08:42 -05:00
Roger Dingledine
a62038f01d
Merge branch 'maint-0.2.1' into maint-0.2.2
2010-12-16 19:23:21 -05:00
Roger Dingledine
ef5b3680c6
put 0.2.1.28 release notes in place too
2010-12-16 19:20:18 -05:00
Roger Dingledine
53c14507eb
Merge branch 'maint-0.2.1' into maint-0.2.2
2010-12-16 17:24:21 -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
Roger Dingledine
975ffe4398
Merge commit 'nickm/fix_security_bug_021' into maint-0.2.1
2010-12-16 16:59:12 -05:00
Nick Mathewson
dd2ae32bc1
Turn on epoll changelists with libevent 2.0.9-rc and later
...
Libevent 2.0 has a "changelist" feature that avoids making redundant
syscalls if we wind up doing a lot of event_add/event_del operations
on the same fd in a row. Unfortunately, due to a weird design
choice in Linux, it doesn't work right with epoll when multiple fds
refer to the same socket (e.g., one is a dup() of the other). We
don't dup() anything we give to Libevent, though, so it is safe for
us to explicitly turn this feature on.
2010-12-16 13:37:43 -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
b8a7bad799
Make payloads into uint8_t.
...
This will avoid some signed/unsigned assignment-related bugs.
2010-12-15 22:31:11 -05:00
Nick Mathewson
d9e9938b0c
Merge branch 'crypto_ideas'
2010-12-14 23:32:05 -05:00
Nick Mathewson
d051751d71
Reformat circuit crypto requirements as a proposal-like document
2010-12-14 23:31:42 -05:00
Nick Mathewson
1361376e14
Add start of rransom's notes on tor crypto requirements
2010-12-14 23:22:21 -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
Robert Ransom
9776ba7fa4
List another place router identity keys are used.
2010-12-13 22:42:11 -08:00
Robert Ransom
021e4ac07e
Fix typos.
2010-12-13 22:34:10 -08:00
Nick Mathewson
462185d180
Add a proposal-ideas document for crypto migration.
2010-12-13 23:39:54 -05:00
Nick Mathewson
785086cfba
Have all of our allocation functions and a few others check for underflow
...
It's all too easy in C to convert an unsigned value to a signed one,
which will (on all modern computers) give you a huge signed value. If
you have a size_t value of size greater than SSIZE_T_MAX, that is way
likelier to be an underflow than it is to be an actual request for
more than 2gb of memory in one go. (There's nothing in Tor that
should be trying to allocate >2gb chunks.)
2010-12-13 18:40:21 -05:00
Nick Mathewson
649ee99846
Base SIZE_T_CEILING on SSIZE_T_MAX.
2010-12-13 18:40:15 -05:00
Robert Ransom
cc051f9aca
Only add each log message to pending_cb_messages once.
2010-12-11 05:26:36 -08:00
Robert Ransom
4a9d60734c
Don't call flush_pending_log_callbacks while logging LD_NOCB messages.
...
Found by boboper.
2010-12-11 04:41:35 -08:00
Nick Mathewson
2118028c50
start reformatting and editing the pluggable-transport proposal
2010-12-11 04:18:15 -05:00
Nick Mathewson
1fb3a60f54
convert draft pluggable transport proposal to plaintext
2010-12-10 14:34:26 -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
