Nick Mathewson
3dbfc6a734
Merge remote branch 'origin/maint-0.2.2'
2011-01-12 12:43:30 -05:00
Nick Mathewson
1e37d8678a
Merge branch 'bug2331' into maint-0.2.2
2011-01-12 12:42:40 -05:00
Nick Mathewson
f4756051fe
add a missing "not" in bug2331 changelog
2011-01-12 12:42:21 -05:00
Nick Mathewson
cbcae4aef1
Merge remote branch 'origin/maint-0.2.2'
2011-01-12 12:38:54 -05:00
Nick Mathewson
597433bcec
Merge branch 'bug2346' into maint-0.2.2
2011-01-12 12:37:51 -05:00
Nick Mathewson
5044cb9752
Explain bug2346 fix better based on suggestions from arma
2011-01-12 12:37:42 -05:00
Nick Mathewson
c9f8a5eebc
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/buffers.c
2011-01-10 17:31:11 -05:00
Nick Mathewson
aa45e82593
Pull up more data when parsing socks messages
...
Previously, we only looked at up to 128 bytes. This is a bad idea
since socks messages can be at least 256+x bytes long. Now we look at
up to 512 bytes; this should be enough for 0.2.2.x to handle all valid
SOCKS messages. For 0.2.3.x, we can think about handling trickier
cases.
Fixes 2330. Bugfix on 0.2.0.16-alpha.
2011-01-10 17:24:16 -05:00
Nick Mathewson
95968a625e
Wait 60 minutes before retrying failed state save; bug2346
2011-01-10 16:51:11 -05:00
Nick Mathewson
f12b253639
Merge remote branch 'origin/maint-0.2.2'
2011-01-10 14:12:53 -05:00
Nick Mathewson
5ae391762c
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-10 14:12:33 -05:00
Karsten Loesing
d43cba6c69
Update to the January 1 2011 Maxmind GeoLite Country database.
2011-01-10 10:37:54 +01:00
Nick Mathewson
9bbb4a1b40
Merge remote branch 'origin/maint-0.2.2'
2011-01-09 15:43:05 -05:00
Nick Mathewson
732275bb81
Describe tor-resolve defaults. Bug 2364.
2011-01-09 15:40:40 -05:00
Nick Mathewson
d16923a35d
Merge remote branch 'origin/maint-0.2.2'
2011-01-07 22:05:11 -05:00
Nick Mathewson
54135b72f8
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-07 22:04:40 -05:00
Nick Mathewson
045e6ebd31
Remove a loud info log message
2011-01-07 22:03:22 -05:00
Nick Mathewson
0a35ac6a22
Correctly detect and exclude addresses outside of our virtual address range
...
Found by cypherpunks; fixes more of 2328. Bug was introduced in 3623a122;
first appeared in 0.2.0.5-alpha.
2011-01-07 12:24:36 -05:00
Nick Mathewson
2be65619f9
Fix wide lines in control.c
2011-01-07 12:16:12 -05:00
Damian Johnson
6661e16e7c
GETINFO options for querying traffic usage
...
This was originally a patch provided by pipe
(http://www.mail-archive.com/or-talk@freehaven.net/msg13085.html ) to
provide a method for controllers to query the total amount of traffic
tor has handled (this is a frequently requested piece of information
by relay operators).
2011-01-07 12:15:14 -05:00
Nick Mathewson
3bc235d979
Fix a strdup() of uninitialized buffer in addressmap_get_virtual_address
...
Partial revert of 22f723e4a3
2011-01-06 13:40:27 -05:00
Nick Mathewson
d4b265d692
Merge remote branch 'origin/maint-0.2.2'
2011-01-06 13:38:08 -05:00
Nick Mathewson
d6329eda96
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-06 13:37:39 -05:00
Nick Mathewson
d6b49c55c5
Merge branch 'bug2328_021' into maint-0.2.1
2011-01-06 13:36:29 -05:00
Nick Mathewson
2008728df7
Notice a little faster if we're running out of virtual addresses
...
We were not decrementing "available" every time we did
++next_virtual_addr in addressmap_get_virtual_address: we left out the
--available when we skipped .00 and .255 addresses.
This didn't actually cause a bug in most cases, since the failure mode
was to keep looping around the virtual addresses until we found one,
or until available hit zero. It could have given you an infinite loop
rather than a useful message, however, if you said "VirtualAddrNetwork
127.0.0.255/32" or something broken like that.
Spotted by cypherpunks
2011-01-06 13:29:36 -05:00
Nick Mathewson
eabddd8ca0
Handle a NULL return from addressmap_get_virtual_address
...
Fix for bug 2328; bugfix on 0.1.2.1-alpha; bug found by doorss.
2011-01-05 16:36:48 -05:00
Nick Mathewson
31d6659d97
Fix a double-counting bug in addrmap_get_virtual_address
...
We were decrementing "available" twice for each in-use address we ran
across. This would make us declare that we ran out of virtual
addresses when the address space was only half full.
2011-01-05 16:02:43 -05:00
Nick Mathewson
240fa42aac
Fix size_t vs unsigned comparison too
2011-01-05 12:49:02 -05:00
Nick Mathewson
fd8f7991e4
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
Makefile.am
2011-01-03 17:25:30 -05:00
Nick Mathewson
0e9d7f105d
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-03 17:24:32 -05:00
Nick Mathewson
e4320689cc
Note that Tor requires Automake 1.7. Fixes bug 2305
2011-01-03 17:24:16 -05:00
Nick Mathewson
0222228d64
Fix up size and sign issues in base32 code
...
Fixes bug 2331.
2011-01-03 16:16:53 -05:00
Nick Mathewson
a87a55a9b6
Merge remote branch 'origin/maint-0.2.2'
2011-01-03 15:55:41 -05:00
Nick Mathewson
f089804332
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-03 15:31:19 -05:00
Nick Mathewson
e365aee971
Avoid assertion on read_file_to_str() with size==SIZE_T_CEILING-1
...
Spotted by doors, fixes bug 2326.
2011-01-03 15:30:11 -05:00
Nick Mathewson
a96b46570f
Merge remote branch 'origin/maint-0.2.2'
2011-01-03 15:16:36 -05:00
Nick Mathewson
cee433d751
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-03 15:15:54 -05:00
Nick Mathewson
e09ab69703
Check size against SIZE_T_CEILING in realloc too.
...
Fixes bug 2324.
2011-01-03 15:15:27 -05:00
Nick Mathewson
0489f7e004
Merge remote branch 'origin/maint-0.2.2'
2011-01-03 13:19:10 -05:00
Nick Mathewson
27cefef3a2
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-03 13:18:33 -05:00
Nick Mathewson
8932753169
Merge remote branch 'rransom/bug2327-v2'
2011-01-03 13:07:43 -05:00
Nick Mathewson
394a6bf4cd
Merge remote branch 'origin/maint-0.2.2'
2011-01-03 12:47:58 -05:00
Nick Mathewson
bb5f99d4df
Merge remote branch 'sebastian/bug2314' into maint-0.2.2
2011-01-03 12:47:14 -05:00
Nick Mathewson
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
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
Damian Johnson
8708ffa655
Implementing getinfo options for the pid, uid, user, and descriptor limit as per proposal 173.
2011-01-03 12:04:56 -05:00
Nick Mathewson
93a6d53ef3
Add a note about _compare_int not doing overflow right
2011-01-03 12:03:21 -05:00
Nick Mathewson
57a86fd433
Fix a wide line in rephist.c
2011-01-03 12:03:04 -05:00
Nick Mathewson
c5382255bd
Merge remote branch 'origin/maint-0.2.2'
2011-01-03 12:00:59 -05:00
Nick Mathewson
40ef9087cf
Fix a function formatting warning in rephist.c
2011-01-03 11:59:47 -05:00
