aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-11-08
|\
| * Turn a memwipe in tor_process_handle_destroy() back to memsetNick Mathewson2012-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()sNick Mathewson2012-11-08
| |
* | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-11-08
|\| | | | | | | | | | | Conflicts: src/common/crypto.c src/or/rendservice.c
| * Add and use and unlikely-to-be-eliminated memwipe()Nick Mathewson2012-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.
| * Fix a remotely triggerable assertion failure (CVE-2012-2250)Nick Mathewson2012-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | If we completed the handshake for the v2 link protocol but wound up negotiating the wong protocol version, we'd become so confused about what part of the handshake we were in that we'd promptly die with an assertion. This is a fix for CVE-2012-2250; it's a bugfix on 0.2.3.6-alpha. All servers running that version or later should really upgrade. Bug and fix from "some guy from France." I tweaked his code slightly to make it log the IP of the offending node.
* | Merge branch 'bug7350' of ssh://git-rw.torproject.org/user/andrea/torAndrea 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.Nick Mathewson2012-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.
* / / 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_Nick Mathewson2012-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 Mathewson2012-11-04
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/or/geoip.c
| * | | 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
| | | |
| * | | 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.Linus Nordberg2012-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 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 ↵nils2012-10-17
| | | | | | | | | | | | | | | | support
* | | | Add an SLIST_ENTRY definition back on non-win32Nick Mathewson2012-11-03
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise we break openbsd headers. Fixes bug 7293; bug not on any released Tor.
* | | | Avoid c99 designated initializers in circuitmux_ewma.cNick Mathewson2012-11-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Rename SLIST_ENTRY to TOR_SLIST_ENTRY to fix windows compilationNick Mathewson2012-11-01
| | | | | | | | | | | | | | | | | | | | | | | | Apparently winnt.h defines a different SLIST_ENTRY of its own. Bug not in any version of Tor.
* | | | Fix whitespaceNick Mathewson2012-10-31
| | | |
* | | | Add a copy of the queue(3) manpage to the git repository.Nick Mathewson2012-10-30
| | | | | | | | | | | | | | | | See 7105
* | | | Merge branch 'bsd_queue' of ssh://git-rw.torproject.org/nickm/torAndrea Shepard2012-10-30
|\ \ \ \ | |_|/ / |/| | |
| * | | Try refactoring channel list to use HT_ and LIST_ stuff directlyNick Mathewson2012-10-12
| | | |
| * | | Use SIMPLEQ, not smartlist_t, for channel cell queues.Nick Mathewson2012-10-12
| | | | | | | | | | | | | | | | This lets us use fewer memory allocations, and avoid O(n^2) iterations
| * | | Add a copy of OpenBSD's sys/queue.h as tor_queue.hNick Mathewson2012-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are as many divergent implementations of sys/queue.h as there are operating systems shipping it, it would seem. They have some code in common, but have drifted apart, and have added other stuff named differently. So I'm taking a relatively sane one, and hoping for the best. I'm taking OpenBSD's in particular because of the lack of external dependencies, the presence of a CIRCLEQ (we could use one of those in places), and the liberal licensing terms. I'm naming the file tor_queue.h, since historically we've run into trouble having headers with the same names as system headers (log.h, for example.)
* | | | Fix undefined reference to libm functions linking tor-fw-helperAnthony G. Basile2012-10-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When configuring tor without upnp support, ie ./configure --disable-upnp, tor-fw-helper fails to link with undefined references to `ceil' and `log'. This if fixed by linking to libm. X-Gentoo-Bug: 435040 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=435040 Reported-by: Alexandre <alexandre.cortes@outlook.com> Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
* | | | Merge remote-tracking branch 'asn/bug6832'Nick Mathewson2012-10-27
|\ \ \ \
| * | | | Add a unit test for the old crash input of tor_timegm().George Kadianakis2012-09-13
| | | | |
* | | | | bump to 0.2.4.5-alpha-devRoger Dingledine2012-10-26
| | | | |
* | | | | touch-upsRoger Dingledine2012-10-26
| | | | |
* | | | | Bump the version number to 0.2.4.5-alphaNick Mathewson2012-10-25
| | | | | | | | | | | | | | | | | | | | (For real this time. It turns out that 4 and 5 are different numbers.)