summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | | | | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-13
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/config.c src/or/dirserv.c src/or/or.h
| * | | | | | | | | | | Merge branch 'feature3076_squashed' into maint-0.2.2Nick Mathewson2011-05-13
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Add a ControlPortFileGroupWritable optionNick Mathewson2011-05-13
| | | | | | | | | | | | |
| | * | | | | | | | | | | Write automatically-chosen control ports to a file.Nick Mathewson2011-05-13
| | | | | | | | | | | | |
| | * | | | | | | | | | | new GETINFO command to return list of listeners of a given typeNick Mathewson2011-05-13
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add a new "tor_sockaddr_to_str()" functionNick Mathewson2011-05-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It does what it says on the tin. It turns out I'll want this in a couple of places.
| | * | | | | | | | | | | Advertise correct DirPort/ORPort when configured with "auto"Nick Mathewson2011-05-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We'll eventually want to do more work here to make sure that the ports are stable over multiple invocations. Otherwise, turning your node on and off will get you a new DirPort/ORPort needlessly.
| | * | | | | | | | | | | Correct the signature for is_listening_on_low_port for "auto" portsNick Mathewson2011-05-13
| | | | | | | | | | | | |
| | * | | | | | | | | | | Teach retry_listener about "auto" ports.Nick Mathewson2011-05-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, it will just immediately close any port declared with "auto" on the grounds that it wasn't configured. Now, it will allow "auto" to match any port. This means FWIW if you configure a socks port with SocksPort 9999 and then transition to SocksPort auto, the original socksport will not get closed and reopened. I'm considering this a feature.
| | * | | | | | | | | | | "(Socks|Control|etc)Port auto" now tells Tor to open an arbitrary portNick Mathewson2011-05-13
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the major part of the implementation for trac issue 3076.
* | | | | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-12
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Downgrade the "we launched 10 circuits for this stream" message. (See bug 3080)Nick Mathewson2011-05-12
| | | | | | | | | | | |
* | | | | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-12
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-05-12
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge remote-tracking branch 'public/bug3122_memcmp_squashed' into maint-0.2.1Nick Mathewson2011-05-12
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'public/bug3122_memcmp_022' into maint-0.2.2Nick Mathewson2011-05-12
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'public/bug3122_memcmp_023'Nick Mathewson2011-05-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Hand-tune the new tor_memcmp instances in 0.2.3Nick Mathewson2011-05-11
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Reapply the automated memcmp conversion to 0.2.3 to catch newly added memcmpsNick Mathewson2011-05-11
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge remote-tracking branch 'public/bug3122_memcmp_022' into bug3122_memcmp_023Nick Mathewson2011-05-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts in various places, mainly node-related. Resolved them in favor of HEAD, with copying of tor_mem* operations from bug3122_memcmp_022. src/common/Makefile.am src/or/circuitlist.c src/or/connection_edge.c src/or/directory.c src/or/microdesc.c src/or/networkstatus.c src/or/router.c src/or/routerlist.c src/test/test_util.c
| | * | | | | | | | | | | | | Hand-tune the new tor_memcmp instances in 0.2.2Nick Mathewson2011-05-11
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Re-apply the automated conversion to 0.2.2 to make handle any memcmps that ↵Nick Mathewson2011-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | snuck in
| | * | | | | | | | | | | | | fwd-port test_util_di_ops into tinytest formatNick Mathewson2011-05-11
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge remote-tracking branch 'public/3122_memcmp_squashed' into ↵Nick Mathewson2011-05-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug3122_memcmp_022 Conflicts throughout. All resolved in favor of taking HEAD and adding tor_mem* or fast_mem* ops as appropriate. src/common/Makefile.am src/or/circuitbuild.c src/or/directory.c src/or/dirserv.c src/or/dirvote.c src/or/networkstatus.c src/or/rendclient.c src/or/rendservice.c src/or/router.c src/or/routerlist.c src/or/routerparse.c src/or/test.c
| | | * | | | | | | | | | | | Hand-conversion and audit phase of memcmp transitionNick Mathewson2011-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Here I looked at the results of the automated conversion and cleaned them up as follows: If there was a tor_memcmp or tor_memeq that was in fact "safe"[*] I changed it to a fast_memcmp or fast_memeq. Otherwise if there was a tor_memcmp that could turn into a tor_memneq or tor_memeq, I converted it. This wants close attention. [*] I'm erring on the side of caution here, and leaving some things as tor_memcmp that could in my opinion use the data-dependent fast_memcmp variant.
| | | * | | | | | | | | | | | Automated conversion of memcmp to tor_memcmp/tor_mem[n]eqNick Mathewson2011-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is _exactly_ the result of perl -i -pe 's/\bmemcmp\(/tor_memcmp\(/g' src/*/*.[ch] perl -i -pe 's/\!\s*tor_memcmp\(/tor_memeq\(/g' src/*/*.[ch] perl -i -pe 's/0\s*==\s*tor_memcmp\(/tor_memeq\(/g' src/*/*.[ch] perl -i -pe 's/0\s*!=\s*tor_memcmp\(/tor_memneq\(/g' src/*/*.[ch] git checkout src/common/di_ops.[ch] git checkout src/or/test.c git checkout src/common/test.h
| | | * | | | | | | | | | | | Add a "di_ops.h" include to util.hNick Mathewson2011-05-11
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Add a data-independent variant of memcmp and a d-i memeq function.Nick Mathewson2011-05-11
| | | | |_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tor_memcmp code is by Robert Ransom, and the tor_memeq code is by me. Both incorporate some ideas from DJB's stuff.
* | | | | | | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Add changes file for bug2503Nick Mathewson2011-05-12
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixes ticket #2503mikey992011-05-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTTPS error code 403 is now reported as: "The https proxy refused to allow connection". Used a switch statement for additional error codes to be explained in the future.
* | | | | | | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Clean up a formatting issue on the manpge; bug3154.Nick Mathewson2011-05-12
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Unmap microdesc cache before replacing it.Nick Mathewson2011-05-12
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we do a replace-then-munmap, windows will never actually rewrite the microdesc cache. Found by wanoskarnet; bugfix on 0.2.2.6-alpha.
* | | | | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-12
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'bug1352' into maint-0.2.2Nick Mathewson2011-05-12
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Rate-limit v2 networkstatus download fail warningsNick Mathewson2011-04-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes part of 1352. We don't care deeply about these warnings, since v2 networkstatuses aren't a big deal.
| | * | | | | | | | | | | Rename connection_dir_download_networkstatus_failed: be clear that it means v2Nick Mathewson2011-04-28
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
* | | | | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-11
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | / / / / / / / / / | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-05-11
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | / / / / / / | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'bug3135' into maint-0.2.1Nick Mathewson2011-05-11
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix crash when read_file_to_string() fails in SAVECONFNick Mathewson2011-05-11
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new behavior is to try to rename the old file if there is one there that we can't read. In all likelihood, that will fail too, but at least we tried, and at least it won't crash.
* | | | | | | | | | Merge branch 'maint-0.2.2'Roger Dingledine2011-05-10
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2011-05-10
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Update to the May 1 2011 Maxmind GeoLite Country databaseRoger Dingledine2011-05-10
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | another changelog heuristic based on 0.2.3.1-alphaRoger Dingledine2011-05-10
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-09
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/directory.c
| * | | | | | | Merge remote-tracking branch 'public/bug3022_v2' into maint-0.2.2Nick Mathewson2011-05-09
| |\ \ \ \ \ \ \
| | * | | | | | | Only authorities should automatically download v2 networkstatus documentsNick Mathewson2011-04-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clients and relays haven't used them since early 0.2.0.x. The only remaining use by authorities learning about new relays ahead of scedule; see proposal 147 for what we intend to do about that. We're leaving in an option (FetchV2Networkstatus) to manually fetch v2 networkstatuses, because apparently dnsel and maybe bwauth want them. This fixes bug 3022.