Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | bump to 0.2.4.6-alpha-dev | Roger Dingledine | 2012-11-13 |
| | |||
* | bump to 0.2.4.6-alpha | Roger Dingledine | 2012-11-13 |
| | |||
* | fold in changes files | Roger Dingledine | 2012-11-12 |
| | |||
* | Merge branch 'maint-0.2.3' | Roger Dingledine | 2012-11-12 |
|\ | |||
| * | use a more logical operator | Roger Dingledine | 2012-11-12 |
| | | | | | | | | | | | | | | Fix a harmless bug when opting against publishing a relay descriptor because DisableNetwork is set. Fixes bug 7464; bugfix on 0.2.3.9-alpha. | ||
* | | Possible fix for bug 7212 | Nick Mathewson | 2012-11-12 |
| | | | | | | | | | | | | | | | | | | This is the simplest possible workaround: make it safe to call circuit_cell_queue_clear() on a non-attached circuit, and make it safe-but-a-LD_BUG-warning to call update_circuit_on_cmux() on a non-attached circuit. LocalWords: unstage src Untracked | ||
* | | Merge branch 'check_for_orconn_on_close_squashed' of ↵ | Andrea Shepard | 2012-11-10 |
|\ \ | | | | | | | | | | ssh://git-rw.torproject.org/user/andrea/tor | ||
| * | | Add changes file for connection_mark_for_close()/connection_mark_and_flush() ↵ | Andrea Shepard | 2012-11-10 |
| | | | | | | | | | | | | or_connection_t checking | ||
| * | | Make everything in connection.c that uses connection_or_notify_error() also ↵ | Andrea Shepard | 2012-11-10 |
| | | | | | | | | | | | | use connection_mark_and_close_internal() to avoid spurious warnings | ||
| * | | Check for orconns in connection_mark_for_close and ↵ | Andrea Shepard | 2012-11-10 |
| | | | | | | | | | | | | connection_mark_and_flush, and pass the call through channel_close_for_error with a warning to avoid asserts | ||
* | | | Fix a memory leak in handling errors on CERTS cells. bug 7422 | Nick Mathewson | 2012-11-08 |
| | | | |||
* | | | Fix test.c compilation on mingw32. | Nick Mathewson | 2012-11-08 |
| | | | | | | | | | | | | | | | | | | Looks like windows doesn't have an s6_addr32 in its in6_addr. Bug not in any released version of Tor; bugfix on abb886014e1ee. | ||
* | | | Merge remote-tracking branch 'origin/maint-0.2.3' | Nick Mathewson | 2012-11-08 |
|\ \ \ | | |/ | |/| | |||
| * | | Turn a memwipe in tor_process_handle_destroy() back to memset | Nick Mathewson | 2012-11-08 |
| | | | | | | | | | | | | | | | It broke linking on tor-resolve.c, and it's not actually sanitizing anything sensitive. Fix for bug 7420; bug not on ony released Tor. | ||
* | | | Turn some memset()s introduced in tor 0.2.4 into memwipe()s | Nick Mathewson | 2012-11-08 |
| | | | |||
* | | | Merge remote-tracking branch 'origin/maint-0.2.3' | Nick Mathewson | 2012-11-08 |
|\| | | |/ |/| | | | | | | | Conflicts: src/common/crypto.c src/or/rendservice.c | ||
| * | Merge branch 'bug7352_023_rebased' into maint-0.2.3 | Nick Mathewson | 2012-11-08 |
| |\ | |||
| | * | Add and use and unlikely-to-be-eliminated memwipe() | Nick Mathewson | 2012-11-08 |
| |/ | | | | | | | | | | | | | | | | | | | Apparently some compilers like to eliminate memset() operations on data that's about to go out-of-scope. I've gone with the safest possible replacement, which might be a bit slow. I don't think this is critical path in any way that will affect performance, but if it is, we can work on that in 0.2.4. Fixes bug 7352. | ||
* | | Merge branch 'bug7350' of ssh://git-rw.torproject.org/user/andrea/tor | Andrea Shepard | 2012-11-07 |
|\ \ | |||
| * | | Add changes file for bug7350 | Andrea Shepard | 2012-11-07 |
| | | | |||
| * | | Don't call channel_send_destroy() when closing a circuit on a closing channel | Andrea Shepard | 2012-11-06 |
| | | | |||
| * | | Check for closing channel in channel_send_destroy() | Andrea Shepard | 2012-11-06 |
| | | | |||
* | | | Merge branch 'bug7285' | Nick Mathewson | 2012-11-06 |
|\ \ \ | |||
| * | | | Fix a stupid logic-error in warnings about low ports. | Nick Mathewson | 2012-11-06 |
| |/ / | | | | | | | | | | | | | | | | Instead of warning about low ports that are advertised, we should have been warning about low ports that we're listening on. Bug 7285, fix on 0.2.3.9-alpha. | ||
* | | | Merge branch 'bug7195' | Nick Mathewson | 2012-11-06 |
|\ \ \ | |/ / |/| | | |||
| * | | Add warning message when a managed proxy dies during configuration. | George Kadianakis | 2012-11-06 |
|/ / | |||
* | | Merge remote-tracking branch 'asn/bug7292' | Nick Mathewson | 2012-11-04 |
|\ \ | |||
| * | | Use LOG_WARN instead of LOG_PROTOCOL_WARN when parsing transport lines. | George Kadianakis | 2012-11-02 |
| | | | |||
* | | | Whitespace fixes | Nick Mathewson | 2012-11-04 |
| | | | |||
* | | | Clean up nonsensical calling convention for config_load_geoip_file_ | Nick Mathewson | 2012-11-04 |
| | | | | | | | | | | | | | | | (How many "load a file" functions do you typically see where the function frees the filename argument?) | ||
* | | | Merge remote-tracking branch 'linus/bug5053-bug5055' | Nick Mathewson | 2012-11-04 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: src/or/geoip.c | ||
| * | | | Change some comments to reflect the multitude of GeoIP databases. | Linus Nordberg | 2012-10-31 |
| | | | | |||
| * | | | Don't memcmp struct in6_addr but rather its s6_addr member. | Linus Nordberg | 2012-10-31 |
| | | | | |||
| * | | | Duplicate less code. | Linus Nordberg | 2012-10-31 |
| | | | | |||
| * | | | Changes files for tickets 5053 and 5055. | Linus Nordberg | 2012-10-22 |
| | | | | |||
| * | | | Name variables more consistently. | Linus Nordberg | 2012-10-22 |
| | | | | |||
| * | | | Document two functions. | Linus Nordberg | 2012-10-22 |
| | | | | |||
| * | | | Rename C reserved identifiers missed before. | Linus Nordberg | 2012-10-20 |
| | | | | |||
| * | | | Add "IPVersions" to control command "status/clients-seen". | Linus Nordberg | 2012-10-20 |
| | | | | |||
| * | | | Duplicate less code. | Linus Nordberg | 2012-10-20 |
| | | | | |||
| * | | | Separate IPv4 and IPv6 geoip file loading. | Linus Nordberg | 2012-10-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add IPv6 geoip file digest to extra info. Also also, add support for IPv6 addresses in control command "ip-to-country". | ||
| * | | | White space. | Linus Nordberg | 2012-10-17 |
| | | | | |||
| * | | | Two changes lost in rebase resurrected. | Linus Nordberg | 2012-10-17 |
| | | | | |||
| * | | | Rename reserved C identifiers. | Linus Nordberg | 2012-10-17 |
| | | | | |||
| * | | | Update geoip6. | Linus Nordberg | 2012-10-17 |
| | | | | |||
| * | | | Minor tweaks to nils' v4 vs v6 bridge usage code. | Karsten Loesing | 2012-10-17 |
| | | | | |||
| * | | | Minor tweaks and comments to nils' geoip v6 code. | Karsten Loesing | 2012-10-17 |
| | | | | |||
| * | | | Include statistics as to how many connections are IPv4 versus IPv6 | nils | 2012-10-17 |
| | | | | |||
| * | | | Add GeoIP database for IPv6 addresses | nils | 2012-10-17 |
| | | | | |||
| * | | | Rename address family specific IPv4 geoip functions in preparation for IPv6 ↵ | nils | 2012-10-17 |
| | | | | | | | | | | | | | | | | support |