0489f7e004
Merge remote branch 'origin/maint-0.2.2'
2011-01-03 13:19:10 -05:00
27cefef3a2
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-03 13:18:33 -05:00
8932753169
Merge remote branch 'rransom/bug2327-v2'
2011-01-03 13:07:43 -05:00
394a6bf4cd
Merge remote branch 'origin/maint-0.2.2'
2011-01-03 12:47:58 -05:00
bb5f99d4df
Merge remote branch 'sebastian/bug2314' into maint-0.2.2
2011-01-03 12:47:14 -05:00
5c09431cc7
Never include pthread.h when building for Windows.
...
On Windows, we never use pthreads, since it doesn't usually exist,
and when it does it tends to be a little weirdly-behaved. But some
mingw installations have a pthreads installed, so autoconf detects
pthread.h and tells us about it. This would make us include
pthread.h, which could make for trouble when the iffy pthread.h
tried to include config.h.
This patch changes compat.h so that we never include pthread.h on
Windows. Fixes bug 2313; bugfix on 0.1.0.1-rc.
2011-01-03 12:45:13 -05:00
1e295666d9
Tweak GETINFO process/* code: no need to print an int as anything other than %d
2011-01-03 12:11:09 -05:00
8708ffa655
Implementing getinfo options for the pid, uid, user, and descriptor limit as per proposal 173.
2011-01-03 12:04:56 -05:00
93a6d53ef3
Add a note about _compare_int not doing overflow right
2011-01-03 12:03:21 -05:00
57a86fd433
Fix a wide line in rephist.c
2011-01-03 12:03:04 -05:00
c5382255bd
Merge remote branch 'origin/maint-0.2.2'
2011-01-03 12:00:59 -05:00
40ef9087cf
Fix a function formatting warning in rephist.c
2011-01-03 11:59:47 -05:00
66039d9843
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
...
Conflicts:
src/or/routerparse.c
2011-01-03 11:58:59 -05:00
989db9aed1
fix whitespace issues
2011-01-03 11:57:42 -05:00
a1ceee193b
Bump copyright statements to 2011 (master)
2011-01-03 11:55:01 -05:00
8730884ebe
Merge remote branch 'origin/maint-0.2.2'
2011-01-03 11:53:28 -05:00
30b3475e6d
Bump copyright statements to 2011 (0.2.2)
2011-01-03 11:52:09 -05:00
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
1a07348a50
Bump copyright statements to 2011
2011-01-03 11:50:39 -05:00
305ba230fe
Don't throw away incomplete SOCKS proxy responses.
...
Introduced in 9796b9bfa6
2010-12-29 05:55:45 -08:00
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
59a3d536d8
Fix compile without warnings on OS X 10.6
2010-12-27 11:37:16 +01:00
9ecf133686
Fix compile wanrings revealed by gcc 4.5 on mingw
2010-12-27 09:47:41 +01:00
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
00775ab4ed
Merge remote branch 'karsten/dirreq-stats-default'
...
Conflicts:
src/or/config.c
2010-12-21 16:01:00 -05:00
95e21779a3
Merge remote branch 'origin/maint-0.2.2'
2010-12-21 15:53:32 -05:00
e895919b17
Merge remote branch 'public/bug2060' into maint-0.2.2
2010-12-21 15:53:03 -05:00
0a3b7f1471
Merge remote branch 'origin/maint-0.2.2'
2010-12-21 15:50:09 -05:00
cdbd6d0fe8
Merge remote branch 'rransom/bug2190_the_hard_way' into maint-0.2.2
2010-12-21 15:48:14 -05:00
69771bb5fc
Merge remote branch 'public/bug2190_021' into maint-0.2.1
2010-12-21 15:44:50 -05:00
c79427a992
Merge branch 'maint-0.2.2'
2010-12-19 22:08:42 -05:00
c63c937465
Merge commit 'nickm/fix_security_bug_022' into maint-0.2.2
2010-12-16 17:24:11 -05:00
975ffe4398
Merge commit 'nickm/fix_security_bug_021' into maint-0.2.1
2010-12-16 16:59:12 -05:00
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
1d0f8fe53c
Merge remote branch 'origin/maint-0.2.2'
2010-12-16 10:06:36 -05:00
591f65dde6
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2010-12-16 10:05:07 -05:00
3c3b1d14fd
Change gabelmoo's IP address and ports.
2010-12-16 13:28:30 +01:00
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
b8a7bad799
Make payloads into uint8_t.
...
This will avoid some signed/unsigned assignment-related bugs.
2010-12-15 22:31:11 -05:00
02c2d9a4aa
bug1666 - Pass-through support for SOCKS5 authentication(4)
...
Implement nickm's suggestion that we tolerate SOCKS5 clients
that send authentication credentials and SOCKS commands all in
one go.
2010-12-14 19:59:42 +00:00
f85f52808c
bug1666 - Pass-through support for SOCKS5 authentication (2)
...
Address Nick's comments:
- Refactor against changes in buffers.c
- Ensure we have negotiated a method before accepting
authentication credentials
2010-12-14 19:47:22 +00:00
bf136b94de
bug1666 - Pass-through support for SOCKS5 authentication
...
If a SOCKS5 client insists on authentication, allow it to
negotiate a connection with Tor's SOCKS server successfully.
Any credentials the client provides are ignored.
This allows Tor to work with SOCKS5 clients that can only
support 'authenticated' connections.
Also add a bunch of basic unit tests for SOCKS4/4a/5 support
in buffers.c.
2010-12-14 19:47:22 +00:00
a62b79dfc9
Merge remote branch 'origin/maint-0.2.2'
2010-12-14 14:13:56 -05:00
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
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
649ee99846
Base SIZE_T_CEILING on SSIZE_T_MAX.
2010-12-13 18:40:15 -05:00
cc051f9aca
Only add each log message to pending_cb_messages once.
2010-12-11 05:26:36 -08:00
4a9d60734c
Don't call flush_pending_log_callbacks while logging LD_NOCB messages.
...
Found by boboper.
2010-12-11 04:41:35 -08:00
35148ba532
Update to the December 1 2010 Maxmind GeoLite Country database.
2010-12-08 17:59:40 +01:00
4e9f9a4ee8
Merge remote branch 'origin/maint-0.2.2'
2010-12-07 11:37:14 -05:00
Nick Mathewson
Damian Johnson
Robert Ransom
Sebastian Hahn
Roger Dingledine
Karsten Loesing
Robert Hogan