summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* | | | | | | | | | Merge branch 'bug2320'Nick Mathewson2011-01-12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use autoconf's FLEXIBLE_ARRAY_MEMBER for unspecified-length arraysNick Mathewson2011-01-06
* | | | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-12
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'bug2331' into maint-0.2.2Nick Mathewson2011-01-12
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | add a missing "not" in bug2331 changelogNick Mathewson2011-01-12
| | * | | | | | | | | | Fix size_t vs unsigned comparison tooNick Mathewson2011-01-05
| | * | | | | | | | | | Fix up size and sign issues in base32 codeNick Mathewson2011-01-03
* | | | | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-12
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'bug2346' into maint-0.2.2Nick Mathewson2011-01-12
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Explain bug2346 fix better based on suggestions from armaNick Mathewson2011-01-12
| | * | | | | | | | | | | Wait 60 minutes before retrying failed state save; bug2346Nick Mathewson2011-01-10
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-10
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Pull up more data when parsing socks messagesNick Mathewson2011-01-10
| |/ / / / / / / / / /
* | | | | | | | | | | 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
* | | | | | | | | Fix wide lines in control.cNick Mathewson2011-01-07
* | | | | | | | | GETINFO options for querying traffic usageDamian Johnson2011-01-07
* | | | | | | | | Fix a strdup() of uninitialized buffer in addressmap_get_virtual_addressNick Mathewson2011-01-06
* | | | | | | | | 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
| | | * | | | | | Handle a NULL return from addressmap_get_virtual_addressNick Mathewson2011-01-05
| | | * | | | | | Fix a double-counting bug in addrmap_get_virtual_addressNick Mathewson2011-01-05
* | | | | | | | | 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
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | / / / / / | | |_|/ / / / / | |/| | | | | |
| | * | | | | | 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
* | | | | | | 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
* | | | | | | 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
* | | | | | | Merge remote branch 'rransom/bug2327-v2'Nick Mathewson2011-01-03
|\ \ \ \ \ \ \
| * | | | | | | Don't throw away incomplete SOCKS proxy responses.Robert Ransom2010-12-29
| * | | | | | | Use evbuffer_pullup properly in fetch_from_evbuffer_socks_client.Robert Ransom2010-12-29
* | | | | | | | 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