summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-11-13bump to 0.2.4.6-alphator-0.2.4.6-alphaRoger Dingledine
2012-11-12fold in changes filesRoger Dingledine
2012-11-12Merge branch 'maint-0.2.3'Roger Dingledine
2012-11-12use a more logical operatorRoger Dingledine
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.
2012-11-12Possible fix for bug 7212Nick Mathewson
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
2012-11-10Merge branch 'check_for_orconn_on_close_squashed' of ↵Andrea Shepard
ssh://git-rw.torproject.org/user/andrea/tor
2012-11-10Add changes file for connection_mark_for_close()/connection_mark_and_flush() ↵Andrea Shepard
or_connection_t checking
2012-11-10Make everything in connection.c that uses connection_or_notify_error() also ↵Andrea Shepard
use connection_mark_and_close_internal() to avoid spurious warnings
2012-11-10Check for orconns in connection_mark_for_close and ↵Andrea Shepard
connection_mark_and_flush, and pass the call through channel_close_for_error with a warning to avoid asserts
2012-11-08Fix a memory leak in handling errors on CERTS cells. bug 7422Nick Mathewson
2012-11-08Fix test.c compilation on mingw32.Nick Mathewson
Looks like windows doesn't have an s6_addr32 in its in6_addr. Bug not in any released version of Tor; bugfix on abb886014e1ee.
2012-11-08Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson
2012-11-08Turn a memwipe in tor_process_handle_destroy() back to memsetNick Mathewson
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.
2012-11-08Turn some memset()s introduced in tor 0.2.4 into memwipe()sNick Mathewson
2012-11-08Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson
Conflicts: src/common/crypto.c src/or/rendservice.c
2012-11-08Merge branch 'bug7352_023_rebased' into maint-0.2.3Nick Mathewson
2012-11-08Add and use and unlikely-to-be-eliminated memwipe()Nick Mathewson
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.
2012-11-07Merge branch 'bug7350' of ssh://git-rw.torproject.org/user/andrea/torAndrea Shepard
2012-11-07Add changes file for bug7350Andrea Shepard
2012-11-06Don't call channel_send_destroy() when closing a circuit on a closing channelAndrea Shepard
2012-11-06Check for closing channel in channel_send_destroy()Andrea Shepard
2012-11-06Merge branch 'bug7285'Nick Mathewson
2012-11-06Merge branch 'bug7195'Nick Mathewson
2012-11-06Add warning message when a managed proxy dies during configuration.George Kadianakis
2012-11-06Fix a stupid logic-error in warnings about low ports.Nick Mathewson
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.
2012-11-04Merge remote-tracking branch 'asn/bug7292'Nick Mathewson
2012-11-04Whitespace fixesNick Mathewson
2012-11-04Clean up nonsensical calling convention for config_load_geoip_file_Nick Mathewson
(How many "load a file" functions do you typically see where the function frees the filename argument?)
2012-11-04Merge remote-tracking branch 'linus/bug5053-bug5055'Nick Mathewson
Conflicts: src/or/geoip.c
2012-11-03Add an SLIST_ENTRY definition back on non-win32Nick Mathewson
Otherwise we break openbsd headers. Fixes bug 7293; bug not on any released Tor.
2012-11-02Use LOG_WARN instead of LOG_PROTOCOL_WARN when parsing transport lines.George Kadianakis
2012-11-02Avoid c99 designated initializers in circuitmux_ewma.cNick Mathewson
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.
2012-11-01Rename SLIST_ENTRY to TOR_SLIST_ENTRY to fix windows compilationNick Mathewson
Apparently winnt.h defines a different SLIST_ENTRY of its own. Bug not in any version of Tor.
2012-10-31Change some comments to reflect the multitude of GeoIP databases.Linus Nordberg
2012-10-31Fix whitespaceNick Mathewson
2012-10-31Don't memcmp struct in6_addr but rather its s6_addr member.Linus Nordberg
2012-10-31Duplicate less code.Linus Nordberg
2012-10-30Add a copy of the queue(3) manpage to the git repository.Nick Mathewson
See 7105
2012-10-30Merge branch 'bsd_queue' of ssh://git-rw.torproject.org/nickm/torAndrea Shepard
2012-10-28changes file for bug 7235Nick Mathewson
2012-10-28Fix undefined reference to libm functions linking tor-fw-helperAnthony G. Basile
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>
2012-10-27Merge remote-tracking branch 'asn/bug6832'Nick Mathewson
2012-10-26bump to 0.2.4.5-alpha-devRoger Dingledine
2012-10-26forward-port the 0.2.3.24-rc changelogtor-0.2.4.5-alphaRoger Dingledine
2012-10-26touch-upsRoger Dingledine
2012-10-25Optimistically say 0.2.4.5-alpha is coming out todayNick Mathewson
2012-10-25Bump the version number to 0.2.4.5-alphaNick Mathewson
(For real this time. It turns out that 4 and 5 are different numbers.)
2012-10-25Bump version to 0.2.4.5-alphaNick Mathewson
2012-10-25Fold in changelog item; draft blurb for 0.2.4.5-alphaNick Mathewson
2012-10-25Merge branch 'link_negotiation_assert_024'Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion