summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
2012-10-25Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson
(Using an -s ours merge for Not taking the CVE-2012-2250 fix from maint-0.2.3; it would conflict.)
2012-10-25Start an 0.2.4.5 changelog.Nick Mathewson
The items from 0.2.3.x are copy-and-pastd from current release-0.2.3 changelog; the others are folded in from changes/*.
2012-10-24Change changes file and comment for 7189, for making it 0.2.4-only for nowNick Mathewson
2012-10-24Merge remote-tracking branch 'public/bug7189_tentative'Nick Mathewson
2012-10-24Only disable TLS tickets when being/acting as a server.Nick Mathewson
Fix for bug 7189.
2012-10-24Fix instructions for using Tor with gcovNick Mathewson
It seems as if our new build system broke gcov for me. I've tried to fix doc/HACKING to describe what I needed to do in order to make it work again.
2012-10-23Fix a remotely triggerable assertion failure (CVE-2012-2250)Nick Mathewson
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, and to forward-port it to 0.2.4.
2012-10-23Fix a remotely triggerable assertion failure (CVE-2012-2250)Nick Mathewson
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.
2012-10-23Use the same changes file for bug7191 as in 0.2.[23]Nick Mathewson
2012-10-23Merge remote-tracking branch 'andrea/bug7191_v2'Nick Mathewson
2012-10-23Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson
This is an "ours" merge; we want a separate fix for this bug (bug7191) in master. Rather than catching the two failing cases, we need to make them not fail.
2012-10-23Make unit test for bug7191 work with new smartlist_new() nameNick Mathewson
2012-10-23Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson
2012-10-23Add some unit tests for smartlist_bsearch_idx() on short listsAndrea Shepard
Conflicts: src/test/test_containers.c
2012-10-23Add a changes file for bug 7191.Nick Mathewson
2012-10-23Fix binary search on lists of 0 or 1 element.Nick Mathewson
The implementation we added has a tendency to crash with lists of 0 or one element. That can happen if we get a consensus vote, v2 consensus, consensus, or geoip file with 0 or 1 element. There's a DOS opportunity there that authorities could exploit against one another, and which an evil v2 authority could exploit against anything downloading v2 directory information.. This fix is minimalistic: It just adds a special-case for 0- and 1-element lists. For 0.2.4 (the current alpha series) we'll want a better patch. This is bug 7191; it's a fix on 0.2.0.10-alpha.
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion