summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | | | | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-10
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/buffers.c
| * | | | | | | | | | | Pull up more data when parsing socks messagesNick Mathewson2011-01-10
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-10
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-01-10
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | / / / / / | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Update to the January 1 2011 Maxmind GeoLite Country database.Karsten Loesing2011-01-10
| | | |_|_|/ / / / | | |/| | | | | |
* | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-09
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Describe tor-resolve defaults. Bug 2364.Nick Mathewson2011-01-09
| | | | | | | | |
* | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-07
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-01-07
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Remove a loud info log messageNick Mathewson2011-01-07
| | | | | | | | |
| | * | | | | | | Correctly detect and exclude addresses outside of our virtual address rangeNick Mathewson2011-01-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Found by cypherpunks; fixes more of 2328. Bug was introduced in 3623a122; first appeared in 0.2.0.5-alpha.
* | | | | | | | | Fix wide lines in control.cNick Mathewson2011-01-07
| | | | | | | | |
* | | | | | | | | GETINFO options for querying traffic usageDamian Johnson2011-01-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | | | | | | Fix a strdup() of uninitialized buffer in addressmap_get_virtual_addressNick Mathewson2011-01-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partial revert of 22f723e4a3fc32983480c7403af9d7e77a3200ea. Bugfix on 0.2.3.0-alpha
* | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-06
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-01-06
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch 'bug2328_021' into maint-0.2.1Nick Mathewson2011-01-06
| | |\ \ \ \ \ \
| | | * | | | | | Notice a little faster if we're running out of virtual addressesNick Mathewson2011-01-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | | Handle a NULL return from addressmap_get_virtual_addressNick Mathewson2011-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for bug 2328; bugfix on 0.1.2.1-alpha; bug found by doorss.
| | | * | | | | | Fix a double-counting bug in addrmap_get_virtual_addressNick Mathewson2011-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-03
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am
| * | | | | | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-01-03
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | / / / / / | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Note that Tor requires Automake 1.7. Fixes bug 2305Nick Mathewson2011-01-03
| | | |/ / / / | | |/| | | |
* | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-03
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-01-03
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Avoid assertion on read_file_to_str() with size==SIZE_T_CEILING-1Nick Mathewson2011-01-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Spotted by doors, fixes bug 2326.
* | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-03
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-01-03
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Check size against SIZE_T_CEILING in realloc too.Nick Mathewson2011-01-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 2324.
* | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-03
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-01-03
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Never include pthread.h when building for Windows.Nick Mathewson2011-01-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge remote branch 'rransom/bug2327-v2'Nick Mathewson2011-01-03
|\ \ \ \ \ \ \
| * | | | | | | Don't throw away incomplete SOCKS proxy responses.Robert Ransom2010-12-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced in 9796b9bfa6a757780d6185547e4baf739c53cdac.
| * | | | | | | Use evbuffer_pullup properly in fetch_from_evbuffer_socks_client.Robert Ransom2010-12-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | evbuffer_pullup does nothing and returns NULL if the caller asks it to linearize more data than the buffer contains. Introduced in 9796b9bfa6a757780d6185547e4baf739c53cdac. Reported by piebeer; fixed with help from doors.
* | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-03
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge remote branch 'sebastian/bug2314' into maint-0.2.2Nick Mathewson2011-01-03
| |\ \ \ \ \ \ \
| | * | | | | | | Fix compile wanrings revealed by gcc 4.5 on mingwSebastian Hahn2010-12-27
| | | | | | | | |
* | | | | | | | | Tweak GETINFO process/* code: no need to print an int as anything other than %dNick Mathewson2011-01-03
| | | | | | | | |
* | | | | | | | | Implementing getinfo options for the pid, uid, user, and descriptor limit as ↵Damian Johnson2011-01-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | per proposal 173.
* | | | | | | | | Add a note about _compare_int not doing overflow rightNick Mathewson2011-01-03
| | | | | | | | |
* | | | | | | | | Fix a wide line in rephist.cNick Mathewson2011-01-03
| | | | | | | | |
* | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-03
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix a function formatting warning in rephist.cNick Mathewson2011-01-03
| | | | | | | | |
| * | | | | | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-01-03
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/routerparse.c
| | * | | | | | | fix whitespace issuesNick Mathewson2011-01-03
| | | | | | | | |
* | | | | | | | | Bump copyright statements to 2011 (master)Nick Mathewson2011-01-03
| | | | | | | | |
* | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-03
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Bump copyright statements to 2011 (0.2.2)Nick Mathewson2011-01-03
| | | | | | | |
| * | | | | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-01-03
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | / / / / / | | |/ / / / / | |/| | | | | | | | | | | | Conflicts: src/common/test.h src/or/test.c