aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'check_for_orconn_on_close_squashed' of ssh://git-rw.torproject....Andrea Shepard2012-11-10
|\
| * Add changes file for connection_mark_for_close()/connection_mark_and_flush() ...Andrea Shepard2012-11-10
| * Make everything in connection.c that uses connection_or_notify_error() also u...Andrea Shepard2012-11-10
| * Check for orconns in connection_mark_for_close and connection_mark_and_flush,...Andrea Shepard2012-11-10
* | Fix a memory leak in handling errors on CERTS cells. bug 7422Nick Mathewson2012-11-08
* | Fix test.c compilation on mingw32.•••Looks like windows doesn't have an s6_addr32 in its in6_addr. Bug not in any released version of Tor; bugfix on abb886014e1ee. Nick Mathewson2012-11-08
* | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-11-08
|\ \
| * | Turn a memwipe in tor_process_handle_destroy() back to memset•••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. Nick Mathewson2012-11-08
* | | Turn some memset()s introduced in tor 0.2.4 into memwipe()sNick Mathewson2012-11-08
* | | Merge remote-tracking branch 'origin/maint-0.2.3'•••Conflicts: src/common/crypto.c src/or/rendservice.c Nick Mathewson2012-11-08
|\| | | |/ |/|
| * Merge branch 'bug7352_023_rebased' into maint-0.2.3Nick Mathewson2012-11-08
| |\
| | * Add and use and unlikely-to-be-eliminated memwipe()•••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. Nick Mathewson2012-11-08
| |/
* | Merge branch 'bug7350' of ssh://git-rw.torproject.org/user/andrea/torAndrea Shepard2012-11-07
|\ \
| * | Add changes file for bug7350Andrea Shepard2012-11-07
| * | Don't call channel_send_destroy() when closing a circuit on a closing channelAndrea Shepard2012-11-06
| * | Check for closing channel in channel_send_destroy()Andrea Shepard2012-11-06
* | | Merge branch 'bug7285'Nick Mathewson2012-11-06
|\ \ \
| * | | Fix a stupid logic-error in warnings about low ports.•••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. Nick Mathewson2012-11-06
| |/ /
* | | Merge branch 'bug7195'Nick Mathewson2012-11-06
|\ \ \ | |/ / |/| |
| * | Add warning message when a managed proxy dies during configuration.George Kadianakis2012-11-06
|/ /
* | Merge remote-tracking branch 'asn/bug7292'Nick Mathewson2012-11-04
|\ \
| * | Use LOG_WARN instead of LOG_PROTOCOL_WARN when parsing transport lines.George Kadianakis2012-11-02
* | | Whitespace fixesNick Mathewson2012-11-04
* | | Clean up nonsensical calling convention for config_load_geoip_file_•••(How many "load a file" functions do you typically see where the function frees the filename argument?) Nick Mathewson2012-11-04
* | | Merge remote-tracking branch 'linus/bug5053-bug5055'•••Conflicts: src/or/geoip.c Nick Mathewson2012-11-04
|\ \ \
| * | | Change some comments to reflect the multitude of GeoIP databases.Linus Nordberg2012-10-31
| * | | Don't memcmp struct in6_addr but rather its s6_addr member.Linus Nordberg2012-10-31
| * | | Duplicate less code.Linus Nordberg2012-10-31
| * | | Changes files for tickets 5053 and 5055.Linus Nordberg2012-10-22
| * | | Name variables more consistently.Linus Nordberg2012-10-22
| * | | Document two functions.Linus Nordberg2012-10-22
| * | | Rename C reserved identifiers missed before.Linus Nordberg2012-10-20
| * | | Add "IPVersions" to control command "status/clients-seen".Linus Nordberg2012-10-20
| * | | Duplicate less code.Linus Nordberg2012-10-20
| * | | Separate IPv4 and IPv6 geoip file loading.•••Also add IPv6 geoip file digest to extra info. Also also, add support for IPv6 addresses in control command "ip-to-country". Linus Nordberg2012-10-20
| * | | White space.Linus Nordberg2012-10-17
| * | | Two changes lost in rebase resurrected.Linus Nordberg2012-10-17
| * | | Rename reserved C identifiers.Linus Nordberg2012-10-17
| * | | Update geoip6.Linus Nordberg2012-10-17
| * | | Minor tweaks to nils' v4 vs v6 bridge usage code.Karsten Loesing2012-10-17
| * | | Minor tweaks and comments to nils' geoip v6 code.Karsten Loesing2012-10-17
| * | | Include statistics as to how many connections are IPv4 versus IPv6nils2012-10-17
| * | | Add GeoIP database for IPv6 addressesnils2012-10-17
| * | | Rename address family specific IPv4 geoip functions in preparation for IPv6 s...nils2012-10-17
* | | | Add an SLIST_ENTRY definition back on non-win32•••Otherwise we break openbsd headers. Fixes bug 7293; bug not on any released Tor. Nick Mathewson2012-11-03
* | | | Avoid c99 designated initializers in circuitmux_ewma.c•••We still want to build on compilers w/o c99 support, such as (notoriously, shamefully) MSVC. So I'm commenting out the designated initializers in circuitmux_ewma.c. The alternative would have been to use some kind of macros to use designated initializers only when they're supported, but that's error-prone, and can lead to code having different meanings under different compilers. Bug 7286; fix on 0.2.4.4-alpha; spotted by Gisle Vanem. Nick Mathewson2012-11-02
* | | | Rename SLIST_ENTRY to TOR_SLIST_ENTRY to fix windows compilation•••Apparently winnt.h defines a different SLIST_ENTRY of its own. Bug not in any version of Tor. Nick Mathewson2012-11-01
* | | | Fix whitespaceNick Mathewson2012-10-31
* | | | Add a copy of the queue(3) manpage to the git repository.•••See 7105 Nick Mathewson2012-10-30
* | | | Merge branch 'bsd_queue' of ssh://git-rw.torproject.org/nickm/torAndrea Shepard2012-10-30
|\ \ \ \ | |_|/ / |/| | |