summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-09-13slight tweak to unify thingstor-0.2.3.4-alphaRoger Dingledine
2011-09-13bump to 0.2.3.4-alphaRoger Dingledine
2011-09-13a blurb for 0.2.3.4-alphaRoger Dingledine
2011-09-13forward-port the 0.2.2.33 changelogRoger Dingledine
2011-09-13Merge branch 'maint-0.2.2'Roger Dingledine
2011-09-13Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine
Conflicts: src/or/main.c src/or/router.c
2011-09-13Generate our ssl session certs with a plausible lifetimeRoger Dingledine
Nobody but Tor uses certs on the wire with 2 hour lifetimes, and it makes us stand out. Resolves ticket 4014.
2011-09-12Merge branch 'maint-0.2.2'Roger Dingledine
2011-09-12Update to the September 2011 GeoIP database.Karsten Loesing
2011-09-11Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-09-11fix whitespace (two-space indent)Roger Dingledine
2011-09-10Demote 'INTRODUCE2 cell is too {old,new}' message to info levelRobert Ransom
2011-09-10Demote HS 'replay detected' log message for DH public keys to info levelRobert Ransom
2011-09-10Describe rend_service_descriptor_t more completelyRobert Ransom
2011-09-10Describe rend_intro_point_t more completelyRobert Ransom
2011-09-10Changes file for bug3936 changesNick Mathewson
2011-09-10Stop parse_client_port_config() from misinterpreting FooListenAddress and ↵Fabian Keil
FooPort in legacy syntax Previously the FooPort was ignored and the default used instead, causing Tor to bind to the wrong port if FooPort and the default port don't match or the CONN_TYPE_FOO_LISTENER has no default port. Fixes #3936.
2011-09-10Fix whitespace in parse_client_port_config()Fabian Keil
2011-09-10Merge remote-tracking branch 'rransom-tor/typo-fix-ohkah8Ah'Nick Mathewson
2011-09-10Fix log message typo.Robert Ransom
2011-09-09start an 0.2.3.4-alpha changelogRoger Dingledine
2011-09-09Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: configure.in src/or/circuitbuild.c
2011-09-09Merge remote-tracking branch 'public/gcc-295-fix' into maint-0.2.2Nick Mathewson
2011-09-09Merge remote-tracking branch 'public/enhance_replay_detection' into maint-0.2.2Nick Mathewson
2011-09-09Check for replays in PK-encrypted part of intro cell, not just in the g^x valueNick Mathewson
2011-09-09Add changes file for bsd4 fixesNick Mathewson
2011-09-07Fix whitespace issues in patches merged today so farNick Mathewson
2011-09-07chown() sockets when User option is setJérémy Bobbio
Fixes bug 3421
2011-09-07fix a const warningNick Mathewson
2011-09-07Merge branch 'bug3327_squashed'Nick Mathewson
2011-09-07Report reason for generating descriptor in an HTTP headerNick Mathewson
Suggested by arma; based on 3327.
2011-09-07Clean up HTTP request header generation a littleNick Mathewson
Use a list of headers rather than trying to printf every header that might exist.
2011-09-07Upload descriptors more often when recent desc is unlistedNick Mathewson
Right now we only force a new descriptor upload every 18 hours. This can make servers become unlisted if they upload a descriptor at time T which the authorities reject as being "too similar" to one they uploaded before. Nothing will actually make the server upload a new descriptor later on, until another 18 hours have passed. This patch changes the upload behavior so that the 18 hour interval applies only when we're listed in a live consensus with a descriptor published within the last 18 hours. Otherwise--if we're not listed in the live consensus, or if we're listed with a publication time over 18 hours in the past--we upload a new descriptor every 90 minutes. This is an attempted bugfix for #3327. If we merge it, it should obsolete #535.
2011-09-07Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/dirserv.c src/or/networkstatus.c Conflicts were related to routerinfo->node shift.
2011-09-07Merge remote-tracking branch 'public/bug2649_squashed' into maint-0.2.2Nick Mathewson
2011-09-07changes file for split_entry_conn (ticket 3627)Nick Mathewson
2011-09-07Remove a now-needless test.Nick Mathewson
2011-09-07Merge remote-tracking branch 'public/split_entry_conn'Nick Mathewson
Conflicts: src/or/connection.c src/or/connection_edge.c src/or/connection_edge.h src/or/dnsserv.c Some of these were a little tricky, since they touched code that changed because of the prop171 fixes.
2011-09-07Die if tor_vasprintf fails in connection_printf_to_bufRobert Ransom
tor_asprintf already asserts if it fails.
2011-09-07Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: configure.in Conflict was between two pieces of configure.in logic added to the same place. Trivial.
2011-09-07Look for correct "ar" to cross-compileNick Mathewson
For some reason, autoconf doesn't by default have an "AC_PROG_AR" for this -- possibly it's assumed that any "ar" you have will work everyplace. Fixes bug 3909; found by sid77. This fixes a build issue first present in fdbdb4dc1500, but the bug (of not using a correct ar) has been in every Tor version ever: it just didn't matter until then.
2011-09-07Merge remote-tracking branch 'public/bug3851'Nick Mathewson
2011-09-06Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/connection_edge.c Conflicted on a router->node transition; fix was easy.
2011-09-06Fix assertion in addressmap_clear_excluded_trackexithostsNick Mathewson
Fixes bug 3923; bugfix on 0.2.2.25-alpha; bugfix from 'laruldan' on trac.
2011-09-02bump to 0.2.3.3-alpha-devRoger Dingledine
2011-09-02merge in one moretor-0.2.3.3-alphaRoger Dingledine
2011-09-02Merge branch 'maint-0.2.2'Roger Dingledine
2011-09-02Correct man page: multiple control auth styles can be set at onceRoger Dingledine
2011-09-02bump to 0.2.3.3-alphaRoger Dingledine
2011-09-01fold in last changes itemRoger Dingledine