aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-03-05Merge remote-tracking branch 'arma/ticket5528'Nick Mathewson
Conflicts: src/or/router.c src/test/test_dir.c
2014-03-05Merge remote-tracking branch 'public/bug8788'Nick Mathewson
2014-03-04Document alternate bandwidth/memory unit spellingsNick Mathewson
2014-03-04Include v3 in documented 'protocols' in rend_service_descriptor_tNick Mathewson
Also make it unsigned and document that it's for INTRODUCE cell versions. Fixes 9099; bugfix on 0.2.1.5-alpha, which introduced the v3 protocol.
2014-03-04Merge branch 'bug10169_025_v2'Nick Mathewson
Conflicts: src/test/test.c
2014-03-04Merge remote-tracking branch 'public/bug10169_024' into bug10169_025_v2Nick Mathewson
Conflicts: src/common/compat_libevent.h src/or/relay.c
2014-03-04Merge remote-tracking branch 'public/bug10169_023' into bug10169_024Nick Mathewson
Conflicts: src/or/relay.c
2014-03-04Mention doc/HACKING in the readmeNick Mathewson
2014-03-03ATTR_NORETURN is needed on lost_owning_controller nowNick Mathewson
This should fixes some "hey, that function could have __attribute__((noreturn))" warnings introduced by f96400d9. Bug not in any released version of Tor.
2014-03-03Fix compilation warnings in tor_addr_make_null patchNick Mathewson
There was one "missing prototype" warning because the test function wasn't static, and one "unused parameter" warning about the "data" parameter. Also, I added a couple of tests to make sure that the "make_null" addresses really were the addresses we expected, by formatting them as strings.
2014-03-03add test for tor_addr_make_nullKevin Murray
Signed-off-by: Kevin Murray <spam@kdmurray.id.au>
2014-03-03tweak changes file.Nick Mathewson
2014-03-03Fix max client name length in HiddenServiceAuthorizeClient descriptionLunar
REND_CLIENTNAME_MAX_LEN is set to 16, not 19.
2014-03-03trivial whitespace fixesRoger Dingledine
2014-03-01forward-port the 0.2.4.21 release notesRoger Dingledine
2014-02-28whitespace fixNick Mathewson
2014-02-28Merge branch 'bug10884_squashed'Nick Mathewson
2014-02-28Unit tests for test_routerkeys_write_fingerprintNick Mathewson
2014-02-28Unit tests for pk fingerprint functionsNick Mathewson
2014-02-28Tighten router_write_fingerprint implNick Mathewson
2014-02-28Write hashed bridge fingerprint to logs and to disk.Karsten Loesing
Implements #10884.
2014-02-28Merge remote-tracking branch 'karsten/task-5824'Nick Mathewson
2014-02-26Monotonize the OOM-killer data timersNick Mathewson
In a couple of places, to implement the OOM-circuit-killer defense against sniper attacks, we have counters to remember the age of cells or data chunks. These timers were based on wall clock time, which can move backwards, thus giving roll-over results for our age calculation. This commit creates a low-budget monotonic time, based on ratcheting gettimeofday(), so that even in the event of a time rollback, we don't do anything _really_ stupid. A future version of Tor should update this function to do something even less stupid here, like employ clock_gettime() or its kin.
2014-02-25Merge remote-tracking branch 'public/bug10449'Nick Mathewson
2014-02-25Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2014-02-25Merge remote-tracking branch 'public/no_itime_queue' into maint-0.2.4Nick Mathewson
2014-02-25Trivial comment fix.Nick Mathewson
2014-02-25Merge remote-tracking branch 'public/bug11048'Nick Mathewson
2014-02-25Merge remote-tracking branch 'karsten/geoip2regcountry'Nick Mathewson
2014-02-25Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2014-02-25Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2014-02-25Fix geoip by falling back to registered countries.Karsten Loesing
See 1d2179bc900f1646a5491b65294e78b175e70056 in master for details. """ Fall back to registered country if necessary. When extracting geoip and geoip6 files from MaxMind's GeoLite2 Country database, we only look at country->iso_code which is the two-character ISO 3166-1 country code of the country where MaxMind believes the end user is located. But if MaxMind thinks a range belongs to anonymous proxies, they don't put anything there. Hence, we omit those ranges and resolve them all to '??'. That's not what we want. What we should do is first try country->iso_code, and if there's no such key, try registered_country->iso_code which is the country in which the ISP has registered the IP address. In short: let's fill all A1 entries with what ARIN et. al think. """
2014-02-25Fall back to registered country if necessary.Karsten Loesing
When extracting geoip and geoip6 files from MaxMind's GeoLite2 Country database, we only look at country->iso_code which is the two-character ISO 3166-1 country code of the country where MaxMind believes the end user is located. But if MaxMind thinks a range belongs to anonymous proxies, they don't put anything there. Hence, we omit those ranges and resolve them all to '??'. That's not what we want. What we should do is first try country->iso_code, and if there's no such key, try registered_country->iso_code which is the country in which the ISP has registered the IP address. In short: let's fill all A1 entries with what ARIN et. al think.
2014-02-25Download MaxMind's geoip file over https.Karsten Loesing
If the cert turns out to be invalid or if wget is otherwise unable to verify it, it's going to return an error and not download the file for us. Spotted by nickm.
2014-02-24Merge branch 'bug11047'Nick Mathewson
2014-02-24Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2014-02-24Merge remote-tracking branch 'public/feature9777_024_squashed' into maint-0.2.4Nick Mathewson
2014-02-24Threadproof our log_backtrace implementationNick Mathewson
It's possible for two threads to hit assertion failures at the same time. If that happens, let's keep them from stomping on the same cb_buf field. Fixes bug 11048; bugfix on 0.2.5.2-alpha. Reported by "cypherpunks".
2014-02-24pass our compiler -fasynchronous-unwind-tables by defaultNick Mathewson
This should make more platforms (in particular, ones with compilers where -fomit-frame-pointer is on by default but table generation isn't) support backtrace generation. Thanks to cypherpunks for this one. Fixes bug 11047; bugfix on 0.2.5.2-alpha.
2014-02-21Include instructions on generating geoip files.Karsten Loesing
Implements #10924.
2014-02-21When not an exit node, don't test for DNS hijacking.Nick Mathewson
Back in 5e762e6a5c0e6729bb7dbb586af2690c087d9ba8, non-exit servers stopped launching DNS requests for users. So there's no need for them to see if their DNS answers are hijacked. Patch from Matt Pagan. I think this is a 965 fix.
2014-02-21Merge remote-tracking branch 'public/bug10987_024'Nick Mathewson
2014-02-21Style tweaks on code, changes file for 10987Nick Mathewson
2014-02-21Fix: send back correct IPv6 SOCKS5 connect replyDavid Goulet
For a client using a SocksPort connection and IPv6, the connect reply from tor daemon did not handle AF_INET6 thus sending back the wrong payload to the client. A changes file is provided and this fixes #10987 Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2014-02-20Changes file for b063ebbc60a1fce9Nick Mathewson
This bugfix didn't get a trac ticket because the internet in this room is an exercise in futility.
2014-02-20fixed long -> int implicit cast warning line 3453Nick Hopper
2014-02-18Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2014-02-18whoops; mistaek in a496010642c2. so many commaNick Mathewson
2014-02-17Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2014-02-17add changes file for bug 10929Nick Mathewson