Nick Mathewson
02a43e5eb6
Merge remote-tracking branch 'public/bug7059'
2012-11-13 21:50:07 -05:00
Nick Mathewson
b17aa28e46
Actually distribute the geoip6 file.
...
Fixes a bug (with no ticket) on 0.2.4.6-alpha.
2012-11-13 21:24:28 -05:00
Andrea Shepard
3b517ea5f4
Add changes file for bug 7267
2012-11-13 13:46:36 -08:00
Andrea Shepard
7ab3004223
Call channel_mark_for_close() properly in hibernate_go_dormant()
2012-11-13 13:45:00 -08:00
Roger Dingledine
83b1a50cc0
bump to 0.2.4.6-alpha-dev
2012-11-13 01:46:59 -05:00
Roger Dingledine
b13c6becc8
bump to 0.2.4.6-alpha
2012-11-13 00:00:33 -05:00
Roger Dingledine
713b5eb31c
fold in changes files
2012-11-12 23:51:47 -05:00
Roger Dingledine
a90affa84b
Merge branch 'maint-0.2.3'
2012-11-12 23:49:37 -05:00
Roger Dingledine
88bb48e785
use a more logical operator
...
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-12 23:47:21 -05:00
Nick Mathewson
f473d83dea
Possible fix for bug 7212
...
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-12 08:28:09 -05:00
Andrea Shepard
0523c8de7d
Merge branch 'check_for_orconn_on_close_squashed' of ssh://git-rw.torproject.org/user/andrea/tor
2012-11-10 03:24:41 -08:00
Andrea Shepard
fc1a9a13cf
Add changes file for connection_mark_for_close()/connection_mark_and_flush() or_connection_t checking
2012-11-10 02:38:40 -08:00
Andrea Shepard
99e82cab30
Make everything in connection.c that uses connection_or_notify_error() also use connection_mark_and_close_internal() to avoid spurious warnings
2012-11-10 02:35:47 -08:00
Andrea Shepard
8124398835
Check for orconns in connection_mark_for_close and connection_mark_and_flush, and pass the call through channel_close_for_error with a warning to avoid asserts
2012-11-10 02:35:47 -08:00
Nick Mathewson
713736a6a7
Fix a memory leak in handling errors on CERTS cells. bug 7422
2012-11-08 23:01:39 -05:00
Nick Mathewson
8b5d95db0d
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 abb886014e
2012-11-08 20:18:34 -05:00
Nick Mathewson
08436b27ff
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-11-08 20:00:54 -05:00
Nick Mathewson
e567b4482a
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.
2012-11-08 19:59:54 -05:00
Nick Mathewson
e1c7d12b1d
Turn some memset()s introduced in tor 0.2.4 into memwipe()s
2012-11-08 17:00:36 -05:00
Nick Mathewson
81deddb08c
Merge remote-tracking branch 'origin/maint-0.2.3'
...
Conflicts:
src/common/crypto.c
src/or/rendservice.c
2012-11-08 16:48:04 -05:00
Nick Mathewson
9ad4776e61
Merge branch 'bug7352_023_rebased' into maint-0.2.3
2012-11-08 16:45:46 -05:00
Nick Mathewson
49dd5ef3a3
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.
2012-11-08 16:44:50 -05:00
Andrea Shepard
9f3f5372b8
Merge branch 'bug7350' of ssh://git-rw.torproject.org/user/andrea/tor
2012-11-07 11:43:04 -08:00
Andrea Shepard
3b270e86be
Add changes file for bug7350
2012-11-07 11:39:49 -08:00
Andrea Shepard
80eb03ae0a
Don't call channel_send_destroy() when closing a circuit on a closing channel
2012-11-06 17:58:59 -08:00
Andrea Shepard
688cea7248
Check for closing channel in channel_send_destroy()
2012-11-06 17:52:14 -08:00
Nick Mathewson
cd054ceada
Merge branch 'bug7285'
2012-11-06 18:02:03 -05:00
Nick Mathewson
b0688bbf49
Merge branch 'bug7195'
2012-11-06 17:53:45 -05:00
George Kadianakis
a9f786758d
Add warning message when a managed proxy dies during configuration.
2012-11-06 17:53:09 -05:00
Nick Mathewson
11c467f643
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.
2012-11-06 17:15:39 -05:00
Nick Mathewson
0e8be13b9f
Allow an optional $ in GETINFO ns/id/<identity>
...
That's not where I'd want to put a $, but apparently the other
foo/id/<identity> things allow it, as does an arguably valid
interpretation of control-spec.txt. So let's be consistent.
Fix for a piece of bug 7059.
2012-11-04 22:12:11 -05:00
Nick Mathewson
39a0a2c3ae
Merge remote-tracking branch 'asn/bug7292'
2012-11-04 21:54:19 -05:00
Nick Mathewson
2b781613b0
Whitespace fixes
2012-11-04 21:52:28 -05:00
Nick Mathewson
98204729aa
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?)
2012-11-04 21:51:02 -05:00
Nick Mathewson
626a8b60d7
Merge remote-tracking branch 'linus/bug5053-bug5055'
...
Conflicts:
src/or/geoip.c
2012-11-04 21:44:31 -05:00
Nick Mathewson
e5ca5040a5
Add an SLIST_ENTRY definition back on non-win32
...
Otherwise we break openbsd headers.
Fixes bug 7293; bug not on any released Tor.
2012-11-03 20:18:43 -04:00
George Kadianakis
37f8a2263e
Use LOG_WARN instead of LOG_PROTOCOL_WARN when parsing transport lines.
2012-11-02 23:48:53 +02:00
Nick Mathewson
05194cce62
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.
2012-11-02 13:14:39 -04:00
Nick Mathewson
ae99fc1ccb
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.
2012-11-01 17:40:27 -04:00
Linus Nordberg
ffddd4de2a
Change some comments to reflect the multitude of GeoIP databases.
2012-10-31 16:38:07 +01:00
Nick Mathewson
9327a9f607
Fix whitespace
2012-10-31 11:27:13 -04:00
Linus Nordberg
e7e68b80a7
Don't memcmp struct in6_addr but rather its s6_addr member.
2012-10-31 15:52:56 +01:00
Linus Nordberg
6a241ff3ff
Duplicate less code.
2012-10-31 13:58:55 +01:00
Nick Mathewson
965d778b26
Add a copy of the queue(3) manpage to the git repository.
...
See 7105
2012-10-30 19:16:15 -04:00
Andrea Shepard
be37125030
Merge branch 'bsd_queue' of ssh://git-rw.torproject.org/nickm/tor
2012-10-30 14:39:14 -07:00
Nick Mathewson
03b32161bc
changes file for bug 7235
2012-10-28 10:58:26 -04:00
Anthony G. Basile
74babcb1ea
Fix undefined reference to libm functions linking tor-fw-helper
...
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-28 10:54:53 -04:00
Nick Mathewson
18f836ee8f
Merge remote-tracking branch 'asn/bug6832'
2012-10-27 16:48:05 -04:00
Roger Dingledine
2fd064d28f
bump to 0.2.4.5-alpha-dev
2012-10-26 02:32:44 -04:00
Roger Dingledine
17a6aa56ce
forward-port the 0.2.3.24-rc changelog
2012-10-26 00:39:55 -04:00
