Nick Mathewson
461771ebbc
Merge branch 'bug4438-v2'
2012-04-24 11:18:41 -04:00
Nick Mathewson
db81cdbb0f
Tweak the bug4438 fix a little: different check, better log
...
Instead of checking for 'rejected' and calling everything else okay,
let's check for 'outdated' and call everythign else a problem. This
way we don't risk missing future errors so much.
When logging a message that _looks_ like an error message at info, we
should mention that it isn't really a problem.
2012-04-24 11:17:36 -04:00
Nick Mathewson
6f5a74002a
Merge remote-tracking branch 'public/bug5112'
2012-04-24 11:14:22 -04:00
Nick Mathewson
3e4ccbc4ba
Merge remote-tracking branch 'public/bug5537'
2012-04-24 11:05:50 -04:00
Nick Mathewson
da820bb9b8
Add changes file for miniupnpc 1.6 fix
2012-04-24 10:58:16 -04:00
Anthony G. Basile
cffc85bb0b
Fix compile error against miniupnpc-1.6 when --enable-upnp
...
The bump from miniupnpc-1.5 to 1.6 changes the definition of
two functions used by tor-fw-helper-upnp.c, upnpDiscover() and
UPNP_AddPortMapping(). This patch addresses this and adds a
check in configure.in for backwards compatibility.
Thanks to Nickolay Kolchin-Semyonov for some hints.
X-Tor-Bug-URL: https://trac.torproject.org/projects/tor/ticket/5434
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=376621
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-04-24 10:56:39 -04:00
Roger Dingledine
bdd7e2878b
bump to 0.2.3.14-alpha-dev
2012-04-23 03:34:04 -04:00
Roger Dingledine
9ebf858824
give 0.2.3.14-alpha a blurb
2012-04-23 03:22:42 -04:00
Roger Dingledine
987b5d08b2
bump to 0.2.3.14-alpha
2012-04-23 03:17:28 -04:00
Roger Dingledine
770433f194
update the torrc.sample timestamp, and clarify socksport 0
2012-04-23 03:10:40 -04:00
Roger Dingledine
56b8597c5e
fold in remaining changes
2012-04-23 02:36:19 -04:00
Roger Dingledine
6718b6e781
Merge remote-tracking branch 'nickm/bug5438'
2012-04-23 02:03:40 -04:00
Roger Dingledine
54d0cdeb93
further changelog cleanups
2012-04-23 01:22:59 -04:00
Robert Ransom
627c37ad6a
Don't reset intro-point creation rate-limiting timer
...
Previously, we would reset it at the drop of a hat -- every time a second
passes without any of the intro-point circs already launched for the
service failing.
Fixes bug 4607.
2012-04-20 17:23:31 -04:00
Nick Mathewson
5630b61f5c
Merge remote-tracking branch 'public/bug5647_cleanup'
2012-04-20 11:28:57 -04:00
Roger Dingledine
774c308431
start to fold in changelog entries
2012-04-19 19:14:47 -04:00
Nick Mathewson
2d24994d16
Merge remote-tracking branch 'asn-mytor/bug5601'
2012-04-19 17:53:19 -04:00
Nick Mathewson
f2384d5e2c
Make base64_decode in rend_parse_client_keys more foolproof
...
In general, whenever we can, we should be doing
base64_decode(buf, sizeof(buf), s, strlen(s)),
and not
base_64_decode(buf, expr1, s, expr2)
where we hope that expr1 is a good name for the size of buf and expr2
is a good formula for the length of the base64 expression in s.
2012-04-19 17:13:47 -04:00
Nick Mathewson
bd7724a57e
Merge remote-tracking branch 'origin/maint-0.2.2'
2012-04-19 17:08:09 -04:00
Roger Dingledine
a0d1e806e0
initial round of changelog stanza cleanup
2012-04-19 15:10:33 -04:00
Nick Mathewson
f6afd4efa6
Fix a log-uninitialized-buffer bug.
...
Fix for 5647; bugfix on 0.2.1.5-alpha.
2012-04-18 23:02:09 -04:00
Nick Mathewson
e9dae1ff2e
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/rendservice.c
Conflicts were due to new NON_ANONYMOUS_MODE_ENABLED tor2web code; I
think I resolved them correctly.
2012-04-18 22:30:02 -04:00
George Kadianakis
2d276ab9d9
rend_service_introduce(): do protocol violation check before anything else.
...
(Cherry-picked from 6ba13e4 by nickm)
2012-04-18 22:26:06 -04:00
Nick Mathewson
4db5a1e151
Remove needless check for a buffer that could not be NULL.
...
Fixes coverity CID 508: coverity scan doesn't like checking a
variable for non-NULL after it has been definitely dereferenced.
This should take us back down to zero coverity issues.
2012-04-18 10:38:39 -04:00
Nick Mathewson
0b1ec16058
Don't fetch v2 networkstatuses from caches, even if auths are down
...
Fix for 5635; fix on 0.2.2.26-beta, where caches stopped fetching this
information.
2012-04-17 17:18:59 -04:00
Peter Palfrader
5d7fab9477
Document unit of bandwidth related options in sample torrc.
2012-04-13 16:33:36 -04:00
George Kadianakis
32267809b5
Trivially refactor validate_pluggable_transports_config().
...
* Remove the ugly if statement.
* constify 'bridge_info_t' in SMARTLIST_FOREACH_BEGIN.
2012-04-12 01:35:46 +02:00
George Kadianakis
9d9b5ed0c6
Improve the message of validate_pluggable_transports_config().
2012-04-12 01:27:58 +02:00
Nick Mathewson
ab338e3bb8
Merge remote-tracking branch 'origin/maint-0.2.2'
2012-04-11 10:06:49 -04:00
Nick Mathewson
86c4b750da
Merge branch 'bug5593' into maint-0.2.2
2012-04-11 10:04:31 -04:00
Nick Mathewson
5465ac5ea3
Merge remote-tracking branch 'origin/maint-0.2.2'
2012-04-11 09:26:37 -04:00
Karsten Loesing
b395b59353
Update to the April 2012 GeoIP database.
2012-04-11 14:15:49 +02:00
Nick Mathewson
dd3f4f1bdb
Include a Host: header with any HTTP/1.1 proxy request
...
Bugfix on 0.2.2.1-alpha, which added the orginal HTTP proxy
authentication code. Fix for bug 5593.
2012-04-10 12:00:20 -04:00
Sebastian Hahn
ed8374eb5a
Simplify DH prime generation logic some.
...
This is just refactoring work here. The old logic was kind of
convoluted, especially after the bug 5572 fix. We don't actually need to
distinguish so many cases here. Dropping detection of the
"!old_options || !old_options->DynamicDHGroups" case is fine because
that's the same that we'd do for clients.
Also add a changes file for bug 5572.
2012-04-08 01:11:02 +02:00
Daniel 'koolfy' Faucon
ce5422ecd1
fix bug 5572
2012-04-07 23:56:52 +02:00
Nick Mathewson
15ac8c5711
Merge remote-tracking branch 'origin/maint-0.2.2'
2012-04-04 21:05:42 -04:00
Nick Mathewson
439fc704f1
Wrap long line; strlen("ides")<strlen("turtles").
2012-04-04 21:05:19 -04:00
Sebastian Hahn
b24487d106
ides has become turtles, and gotten a new IP address
...
As per ticket 5569
2012-04-05 01:53:04 +02:00
Nick Mathewson
b8e582255e
Merge remote-tracking branch 'asn-mytor/bug5558_take2'
2012-04-03 12:06:07 -04:00
George Kadianakis
b80728a115
tor_vsscanf(): Don't return -1 if '%%' doesn't match.
...
tor_vsscanf() is supposed to return the current number of matches on
match failure.
2012-04-03 16:20:24 +02:00
Nick Mathewson
6a9e693fbe
Suppress "decided to publish new descriptor" message when not a server
...
The message only means that we're publishing a new descriptor when we
are actually in some kind of server mode, and publication is on.
Fix for bug 3942; bugfix on 0.2.3.2-alpha.
2012-04-02 18:59:21 -04:00
Daniel 'koolfy' Faucon
42143979d8
Add a warning about settign a bridge in MyFamily
2012-04-02 18:16:14 -04:00
Daniel 'koolfy' Faucon
116dcf6ca9
Make it clear that bridges should not be set in MyFamily
2012-04-02 18:16:13 -04:00
Roger Dingledine
c7cbd06d5f
Merge branch 'maint-0.2.2'
...
Conflicts:
src/or/config.c
2012-04-01 16:03:16 -04:00
Roger Dingledine
5fed1ccd90
put a _ before or_options_t elements that aren't configurable
...
it's fine with me if we change the current convention, but we should
actually decide to change it if we want to.
2012-04-01 15:59:38 -04:00
Roger Dingledine
40ab832c4e
BridgePassword was never for debugging
...
It is for the not-yet-implemented bridge community design.
2012-04-01 15:59:00 -04:00
Nick Mathewson
341c6a59db
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/config.c
Conflict was in or_options_free, where two newly added fields had free
calls in the same place.
2012-04-01 00:46:52 -04:00
Nick Mathewson
9a69c24150
Do not use strcmp() to compare an http authenticator to its expected value
...
This fixes a side-channel attack on the (fortunately unused!)
BridgePassword option for bridge authorities. Fix for bug 5543;
bugfix on 0.2.0.14-alpha.
2012-04-01 00:42:04 -04:00
Nick Mathewson
548f2e32cd
Remove the deprecated FooListenAddress options from torrc.sample.in
...
Bug 5438.
2012-03-30 16:53:02 -04:00
Nick Mathewson
a74905cea4
We allow IPv6 connections, don't use sockaddr_in with getsockname
...
This fixes client_check_address_changed to work better with IPv6 Tor
clients, and prevents them from spewing errors. Fix for ticket 5537.
2012-03-30 16:43:52 -04:00