- tor-commits - lists.torproject.org

[tor/master] Make findMergedChanges.pl print a usage msg when started with no args
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit 751e40805556fadec616aa79150f12e3bf87c46b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 29 15:26:19 2011 -0400 Make findMergedChanges.pl print a usage msg when started with no args Otherwise I need to figure out what it does and how to make it do it every time I want to use it. It did that unixy thing where running it with no arguments printed nothing and returned. --- contrib/findMergedChanges.pl | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/contrib/findMergedChanges.pl b/contrib/findMergedChanges.pl index 1694716..460424f 100755 --- a/contrib/findMergedChanges.pl +++ b/contrib/findMergedChanges.pl @@ -16,6 +16,26 @@ sub nChanges { my $look_for_type = "merged"; +if (! @ARGV) { + print <<EOF +Usage: + findMergedChanges.pl [--merged/--unmerged/--weird/--list] changes/* + +A change is "merged" if it has ever been merged to release-0.2.2 and it has had +no subsequent changes in master. + +A change is "unmerged" if it has never been merged to release-0.2.2 and it +has had changes in master. + +A change is "weird" if it has been merged to release-0.2.2 and it *has* had +subsequent changes in master. + +Suggested application: + findMergedChanges.pl --merged changes/* | xargs -n 1 git rm + +EOF +} + while (@ARGV and $ARGV[0] =~ /^--/) { my $flag = shift @ARGV; if ($flag =~ /^--(weird|merged|unmerged|list)/) {

1 0

[tor/master] Remove changes files that were merged to changelogs of 0.2.2.25-alpha or earlier
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit a23ec308e4b0a9286589b798bb3831c93949e3ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 29 15:25:33 2011 -0400 Remove changes files that were merged to changelogs of 0.2.2.25-alpha or earlier --- changes/1863_bwhist | 16 -------- changes/all_descs | 4 -- changes/bug1035 | 13 ------ changes/bug1090-general | 73 ----------------------------------- changes/bug1090-launch-warning | 5 -- changes/bug1172 | 9 ---- changes/bug2250 | 5 -- changes/bug2366 | 8 ---- changes/bug2403 | 6 --- changes/bug2475 | 5 -- changes/bug2504 | 5 -- changes/bug2510 | 8 ---- changes/bug2511 | 6 --- changes/bug2572 | 5 -- changes/bug2629 | 5 -- changes/bug2660 | 7 --- changes/bug2683a | 3 - changes/bug2696 | 5 -- changes/bug2698 | 6 --- changes/bug2704 | 5 -- changes/bug2704_part1 | 5 -- changes/bug2704_part2 | 5 -- changes/bug2716 | 5 -- changes/bug2722 | 11 ----- changes/bug2750 | 6 --- changes/bug2756 | 11 ----- changes/bug2757 | 6 --- changes/bug2899 | 4 -- changes/bug2917 | 4 -- changes/bug2933 | 4 -- changes/bug2948 | 7 --- changes/bug2971 | 6 --- changes/bug2979 | 9 ---- changes/bug3012 | 5 -- changes/bug3020 | 7 --- changes/bug3039 | 5 -- changes/bug539_removal | 6 --- changes/cbt_hi_res | 7 --- changes/cbt_parallel_intro | 4 -- changes/clear_trackexithost | 5 -- changes/connect_err_reporting | 6 --- changes/count_overflow | 5 -- changes/doxygen | 6 --- changes/exitnodes_reliable | 7 --- changes/feature2711 | 4 -- changes/forget-rend-descs-on-newnym | 21 ---------- changes/full_ap_circuits | 6 --- changes/geoip-apr2011 | 3 - changes/geoip-mar2011 | 3 - changes/gmtime_null | 6 --- changes/hsdir_assignment | 8 ---- changes/ipv6_crash | 4 -- changes/kill_ftime | 7 --- changes/log-typo-2011-03-15-01 | 3 - changes/log_domains | 12 ------ changes/microdesc-double-free | 7 --- changes/noroute | 5 -- changes/osx_forgotten_compilefix | 4 -- changes/ticket2497 | 4 -- changes/torspec.git | 5 -- changes/win_tmp_dir | 4 -- changes/zlib_aint_openssl | 3 - 62 files changed, 0 insertions(+), 454 deletions(-) diff --git a/changes/1863_bwhist b/changes/1863_bwhist deleted file mode 100644 index b942509..0000000 --- a/changes/1863_bwhist +++ /dev/null @@ -1,16 +0,0 @@ - o Minor features - - Servers now save observed maximum bandwidth throughput rates - to their state file (along with total usage, which was already - saved) so that they can determine their correct estimated - bandwidth on restart. Resolves bug 1863, where Tor servers - would reset their estimated bandwidth to 0 after restarting. - - o Minor bugfixes - - Fix a bug in banwidth history state parsing that could have been - triggered if a future version of Tor ever changed the timing - granularity at which bandwidth history is measured. Bugfix on - Tor 0.1.1.11-alpha. - - Correctly clear out dir_read/dir_write history when there is an - error parsing any bw history value from the state file. Bugfix on - Tor 0.2.2.15-alpha. - diff --git a/changes/all_descs b/changes/all_descs deleted file mode 100644 index 10711b2..0000000 --- a/changes/all_descs +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes (bridge authority) - - Do not allow encrypte requests for "all" bridges to return all - bridges. - diff --git a/changes/bug1035 b/changes/bug1035 deleted file mode 100644 index 3d86330..0000000 --- a/changes/bug1035 +++ /dev/null @@ -1,13 +0,0 @@ - o Minor features (authorities) - - Take altered router IP addresses and ORPorts into account when - determining router stability. Previously, if a router changed - its IP or ORPort, the authorities would not treat it as having - any downtime for the purposes of stability calculation, whereas - clients would experience downtime since the change could take a - while to propagate to them. Resolves issue 1035. - o Minor bugfixes (authorities) - - Try to be more robust to hops back in time when calculating - router stability. Previously, if a run of uptime or downtime - appeared to be negative, the calculation could give incorrect - results. Bugfix on 0.2.0.6-alpha. - diff --git a/changes/bug1090-general b/changes/bug1090-general deleted file mode 100644 index 4656315..0000000 --- a/changes/bug1090-general +++ /dev/null @@ -1,73 +0,0 @@ - o Major features and bugfixes (node selection) - - - Revise and unify the meaning of the ExitNodes, EntryNodes, - ExcludeEntryNodes, ExcludeExitNodes, ExcludeNodes, and - StrictNodes options. Previously, we had been ambiguous in - describing what counted as an "exit" node, and what operations - exactly "StrictNodes 0" would permit. This created confusion - when people saw nodes built through unexpected circuits, and - made it hard to tell real bugs from surprises. We now stipulate - that the intended behavior is: - - . "Exit", in the context of ExitNodes and ExcludeExitNodes, - means a node that delivers user traffic outside the Tor - network. - . "Entry", in the context of EntryNodes and ExcludeEntryNodes, - means a node used as the first hop of a multihop circuit: - it doesn't include direct connections to directory servers. - . "ExcludeNodes" applies to all nodes. - . "StrictNodes" changes the behavior of ExcludeNodes only. - When StrictNodes is set, Tor should avoid all nodes listed - in ExcludeNodes, even when it will make user requests - fail. When StrictNodes is *not* set, then Tor should - follow ExcludeNodes whenever it can, except when it must - use an excluded node to perform self-tests, connect to a - hidden service, provide a hidden service, fulfill a .exit - request, upload directory information, or fetch directory - information. - - Collectively, the changes to implement the behavior are a fix for - bug 1090. - - - ExcludeNodes now takes precedence over EntryNodes and ExitNodes: - if a node is listed in both, it's treated as excluded. - - - ExcludeNodes now applies to directory nodes: as a preference if - StrictNodes is 0, or an absolute requirement if StrictNodes is 1. - (Don't exclude all the directory authorities and set StrictNodes - to 1 unless you really want your Tor to break.) - - - ExcludeNodes and ExcludeExitNodes now override exit enclaving. - - - ExcludeExitNodes now overrides .exit requests. - - - We don't use bridges from ExcludeNodes. - - - When StrictNodes is 1: - . We now apply ExcludeNodes to hidden service introduction points - and to rendezvous points selected by hidden service users. - This can make your hidden service less reliable: use it with - caution! - . If we have used ExcludeNodes on ourself, do not try self-tests. - . If we have excluded all the directory authorities, we will - not even try to upload our descriptor if we're a server. - . Do not honor .exit requests to an excluded node. - - - Remove a misfeature that caused us to ignore the Fast/Stable flags - if ExitNodes was set. Bugfix on 0.2.2.7-alpha. - - - When the set of permitted nodes changes, we now remove any - mappings introduced via TrackExitHosts to now-excluded nodes. - Bugfix on 0.1.0.1-rc. - - - We never cannibalize a circuit that had excluded nodes on it, - even if StrictNodes is 0. Bugfix on 0.1.0.1-rc. - - - Improve log messages related to excluded nodes. - - - Revert a change where we would be laxer about attaching streams to - circuits than when building the circuits. This was meant to - prevent a set of bugs where streams were never attachable, but our - improved code here should make this unnecessary. Bugfix on - 0.2.2.7-alpha. - diff --git a/changes/bug1090-launch-warning b/changes/bug1090-launch-warning deleted file mode 100644 index 3f3fbcb..0000000 --- a/changes/bug1090-launch-warning +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features: - - Keep track of how many times we launch a new circuit to handle - a given stream. Too many launches could indicate an inconsistency - between our "launch a circuit to handle this stream" logic and our - "attach our stream to one of the available circuits" logic. diff --git a/changes/bug1172 b/changes/bug1172 deleted file mode 100644 index 3abd743..0000000 --- a/changes/bug1172 +++ /dev/null @@ -1,9 +0,0 @@ - o Minor bugfixes: - - When we restart our relay, we might get a successful connection - from the outside before we've started our reachability tests, - triggering a warning: "ORPort found reachable, but I have no - routerinfo yet. Failing to inform controller of success." This - bug was harmless unless Tor is running under a controller - like Vidalia, in which case the controller would never get a - REACHABILITY_SUCCEEDED status event. Bugfix on 0.1.2.6-alpha; - fixes bug 1172. diff --git a/changes/bug2250 b/changes/bug2250 deleted file mode 100644 index 95eb55d..0000000 --- a/changes/bug2250 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Fix an assert that got triggered when using the TestingTorNetwork - configuration option and then issuing a GETINFO config-text control - command. Fixes bug 2250; bugfix on 0.2.1.2-alpha. - diff --git a/changes/bug2366 b/changes/bug2366 deleted file mode 100644 index d171be4..0000000 --- a/changes/bug2366 +++ /dev/null @@ -1,8 +0,0 @@ - o Minor bugfixes - - When a relay decides that its DNS is too broken for it to serve - as an exit server, it advertised itself as a non-exit, but - continued to act as an exit. This could create accidental - partitioning opportunities for users. Instead, if a relay is - going to advertise reject *:* as its exit policy, it should - really act with exit policy "reject *:*". Fixes bug 2366. - Bugfix on Tor 0.1.2.5-alpha. Bugfix by user "postman" on trac. diff --git a/changes/bug2403 b/changes/bug2403 deleted file mode 100644 index 3b29b37..0000000 --- a/changes/bug2403 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes: - - In the special case where you configure a public exit relay as your - bridge, Tor would be willing to use that exit relay as the last - hop in your circuit as well. Now we fail that circuit instead. - Bugfix on 0.2.0.12-alpha. Fixes bug 2403. Reported by "piebeer". - diff --git a/changes/bug2475 b/changes/bug2475 deleted file mode 100644 index d6f0595..0000000 --- a/changes/bug2475 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Avoid signed/unsigned comparisons by making SIZE_T_CEILING unsigned. - (None of the cases where we did this before were wrong, but by making - this change we can avoid warnings.) Fixes bug2475; bugfix on - Tor 0.2.1.28. diff --git a/changes/bug2504 b/changes/bug2504 deleted file mode 100644 index 791600e..0000000 --- a/changes/bug2504 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Fix a bug with our locking implementation on windows that couldn't - correctly detect when a file was already locked. Fixes bug 2504, - bugfix on 0.2.1.6-alpha. - diff --git a/changes/bug2510 b/changes/bug2510 deleted file mode 100644 index 2c3f613..0000000 --- a/changes/bug2510 +++ /dev/null @@ -1,8 +0,0 @@ - o Major bugfixes: - - Fix a bug where bridge users who configure the non-canonical - address of a bridge automatically switch to its canonical - address. If a bridge listens at more than one address, it should be - able to advertise those addresses independently and any non-blocked - addresses should continue to work. Bugfix on Tor 0.2.0.x. Fixes - bug 2510. - diff --git a/changes/bug2511 b/changes/bug2511 deleted file mode 100644 index a27696a..0000000 --- a/changes/bug2511 +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixes: - - If you configured Tor to use bridge A, and then quit and - configured Tor to use bridge B instead, it would happily continue - to use bridge A if it's still reachable. While this behavior is - a feature if your goal is connectivity, in some scenarios it's a - dangerous bug. Bugfix on Tor 0.2.0.1-alpha; fixes bug 2511. diff --git a/changes/bug2572 b/changes/bug2572 deleted file mode 100644 index a5cca28..0000000 --- a/changes/bug2572 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Don't crash a bridge authority on SIGHUP if it can't force itself - into its routerlist. Fixes bug 2572. - - diff --git a/changes/bug2629 b/changes/bug2629 deleted file mode 100644 index 87817cf..0000000 --- a/changes/bug2629 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes - - Fix a crash bug that could occur occasionally when a client was - configured with a large number of bridges. Fixes bug 2629; bugfix - on 0.2.1.2-alpha. Bugfix by trac user "shitlei". - diff --git a/changes/bug2660 b/changes/bug2660 deleted file mode 100644 index 2aa06d3..0000000 --- a/changes/bug2660 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes: - - Fix connect() failures on some platforms (BSD, OS X). Bugfix on - 0.2.0.3-alpha; fixes first part of bug 2660. Patch by piebeer. - - Set target port in get_interface_address6() correctly. Bugfix - on 0.1.1.4-alpha and 0.2.0.3-alpha; fixes second part of bug - 2660. - diff --git a/changes/bug2683a b/changes/bug2683a deleted file mode 100644 index 2fe308b..0000000 --- a/changes/bug2683a +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features - - Log the source of a rejected POSTed v3 networkstatus vote. - diff --git a/changes/bug2696 b/changes/bug2696 deleted file mode 100644 index 6ea41d4..0000000 --- a/changes/bug2696 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features: - - Make compilation with clang possible when using - --enable-gcc-warnings by removing two warnings that clang hasn't - implemented yet and by fixing a few warnings. Implements ticket - 2696. diff --git a/changes/bug2698 b/changes/bug2698 deleted file mode 100644 index d995788..0000000 --- a/changes/bug2698 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes: - - Fix an issue that prevented static linking of libevent on - some platforms (notably Linux). Fixes bug 2698, bugfix on - versions 0.2.1.23/0.2.2.8-alpha (the versions introducing - the --with-static-libevent configure option). - diff --git a/changes/bug2704 b/changes/bug2704 deleted file mode 100644 index 821b38b..0000000 --- a/changes/bug2704 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes: - - When writing our maximum bw for the current interval to the state - file, don't wrongly inflate that value by a factor of 10 anymore. - Fixes more of bug 2704. - diff --git a/changes/bug2704_part1 b/changes/bug2704_part1 deleted file mode 100644 index eaf2281..0000000 --- a/changes/bug2704_part1 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Fix an issue causing calculation of Tor's average bandwidth as saved - in the state file to be 10 times smaller than it should be. Fixes the - first part of bug 2704, bugfix on tor-0.2.2.23-alpha. - diff --git a/changes/bug2704_part2 b/changes/bug2704_part2 deleted file mode 100644 index 962c8b7..0000000 --- a/changes/bug2704_part2 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes: - - Prevent relays that read their bandwidth history from their state file - from arbitrarily inflating that value. Fixes the second half of bug - 2704, bugfix on tor-0.2.2.23-alpha. - diff --git a/changes/bug2716 b/changes/bug2716 deleted file mode 100644 index 4663ed3..0000000 --- a/changes/bug2716 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features: - - When a relay has failed several reachability tests, be more accurate - at recording when it became unreachable, so we can in turn provide - more accuracy at assigning Stable, Guard, HSDir, etc flags. Bugfix - on 0.2.0.6-alpha. Resolves bug 2716. diff --git a/changes/bug2722 b/changes/bug2722 deleted file mode 100644 index ed132fc..0000000 --- a/changes/bug2722 +++ /dev/null @@ -1,11 +0,0 @@ - o Minor bugfixes - - Ignore the TunnelDirConns option when determining which HSDir - relays are responsible for a hidden service descriptor ID. - Currently, clients and hidden services with TunnelDirConns off - will skip over HSDir relays which do not advertise a DirPort - when making a list of HSDirs responsible for a descriptor ID, - even though they would never try to use a HSDir's DirPort to - upload or fetch a hidden service descriptor. Fixes bug 2722; - bugfix on 0.2.1.6-alpha. - - diff --git a/changes/bug2750 b/changes/bug2750 deleted file mode 100644 index 4371a0a..0000000 --- a/changes/bug2750 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes - - Correct the warning displayed when a rendezvous descriptor exceeds - the maximum size. Fixes bug 2750; bugfix on 0.2.1.5-alpha. Found - by John Brooks. - - diff --git a/changes/bug2756 b/changes/bug2756 deleted file mode 100644 index 0cad515..0000000 --- a/changes/bug2756 +++ /dev/null @@ -1,11 +0,0 @@ - o Minor bugfixes (spec conformance, performance): - - We now ask the other side of a stream (the client or the exit) - for more data on that stream when the amount of queued data on - that stream dips low enough. Previously, we wouldn't ask the - other side for more data until either it sent us more data - (which it wasn't supposed to do if it had exhausted its - window!) or until we had completely flushed all our queued - data. Fixing this should improve throughput. Fixes bug 2756; - bugfix on the earliest released versions of Tor (svn commit - r152). - diff --git a/changes/bug2757 b/changes/bug2757 deleted file mode 100644 index f947afa..0000000 --- a/changes/bug2757 +++ /dev/null @@ -1,6 +0,0 @@ - - Minor bugfixes - o Avoid a double-mark-for-free warning when failing to attach a - transparent proxy connection. (We thought we had fixed this in - 0.2.2.23-alpha, but it turns out our fix was checking the wrong - connection.) Fixes bug 2757; bugfix on 0.1.2.1-alpha (the original - bug) and 0.2.2.23-alpha (the incorrect fix). diff --git a/changes/bug2899 b/changes/bug2899 deleted file mode 100644 index 6af86d0..0000000 --- a/changes/bug2899 +++ /dev/null @@ -1,4 +0,0 @@ - - Minor bugfixes: - o Downgrade "no current certificates known for authority" message from - Notice to Info. Bugfix on 0.2.0.10-alpha; fixes bug 2899. - diff --git a/changes/bug2917 b/changes/bug2917 deleted file mode 100644 index 6b1e643..0000000 --- a/changes/bug2917 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes - - Make the SIGNAL DUMP control-port command work on FreeBSD. Fixes - bug 2917. Bugfix on 0.1.1.1-alpha. - diff --git a/changes/bug2933 b/changes/bug2933 deleted file mode 100644 index 7aaf526..0000000 --- a/changes/bug2933 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes - - Fix an uncommon assertion failure when running with DNSPort under - heavy load. Fixes bug 2933; bugfix on 2.0.1-alpha. - diff --git a/changes/bug2948 b/changes/bug2948 deleted file mode 100644 index 640ef62..0000000 --- a/changes/bug2948 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes - - Only limit the lengths of single HS descriptors, even when - multiple HS descriptors are published to an HSDir relay in a - single POST operation. Fixes bug 2948; bugfix on 0.2.1.5-alpha. - Found by hsdir. - - diff --git a/changes/bug2971 b/changes/bug2971 deleted file mode 100644 index 8b71ce0..0000000 --- a/changes/bug2971 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes: - - Be more consistent in our treatment of file system paths. ~ should - get expanded to the user's home directory in the Log config option. - Bugfix on 0.2.0.1-alpha, which introduced the feature for the -f and - --DataDirectory options. - diff --git a/changes/bug2979 b/changes/bug2979 deleted file mode 100644 index fe1f45f..0000000 --- a/changes/bug2979 +++ /dev/null @@ -1,9 +0,0 @@ - o Minor bugfixes: - - If the Nickname configuration option wasn't given, Tor used to pick - a nickname based on the local hostname as the nickname for a relay. - Because nicknames are not very important in today's Tor and the - "Unnamed" nickname has been implemented, this is now problematic - behaviour: It leaks information about the hostname without being - useful at all. Bugfix on tor-0.1.2.2-alpha, which introduced the - Unnamed nickname. Fixes bug 2979, reported by tagnaq. - diff --git a/changes/bug3012 b/changes/bug3012 deleted file mode 100644 index dfde5fa..0000000 --- a/changes/bug3012 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features: - - Relays can go for weeks without writing out their state file. A - relay that crashes would lose its bandwidth history (including - capacity estimate), client country statistics, and so on. Now relays - checkpoint the file at least every 12 hours. Addresses bug 3012. diff --git a/changes/bug3020 b/changes/bug3020 deleted file mode 100644 index b987161..0000000 --- a/changes/bug3020 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes: - - When checking whether a hibernation period has fully elapsed, use - the amount of seconds we expect for that period instead of using - the new period that just started. This would cause an issue because - February is a really short month. Bugfix on 0.2.2.17-alpha; - fixes bug 3020. - diff --git a/changes/bug3039 b/changes/bug3039 deleted file mode 100644 index 7347ee3..0000000 --- a/changes/bug3039 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Write the current time into the LastWritten line in our state file, - rather than the time from the previous write attempt. Also, stop - trying to use a time of -1 in our log statements. Fixes bug 3039; - bugfix on 0.2.2.14-alpha. diff --git a/changes/bug539_removal b/changes/bug539_removal deleted file mode 100644 index dbff43d..0000000 --- a/changes/bug539_removal +++ /dev/null @@ -1,6 +0,0 @@ - o Removed code - - Removed workaround code to handle directory responses from - servers that had bug 539 (they would send HTTP status 503 - responses _and_ send a body too). Since only server versions - before 0.2.0.16-alpha/0.1.2.19 were affected, there is no longer - reason to keep the workaround in place. diff --git a/changes/cbt_hi_res b/changes/cbt_hi_res deleted file mode 100644 index c0df118..0000000 --- a/changes/cbt_hi_res +++ /dev/null @@ -1,7 +0,0 @@ - o Minor features - - When expiring circuits, use microsecond timers rather than one-second - timers. This can avoid an unpleasant situation where a circuit is - launched near the end of one second and expired right near the - beginning of the next, and prevent fluctuations in circuit timeout - values. - diff --git a/changes/cbt_parallel_intro b/changes/cbt_parallel_intro deleted file mode 100644 index 44e377f..0000000 --- a/changes/cbt_parallel_intro +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features - - Use computed circuit-build timeouts to decide when to launch - parallel introdution circuits. (Previously, we would retry - after 15 seconds.) diff --git a/changes/clear_trackexithost b/changes/clear_trackexithost deleted file mode 100644 index b9ac6fe..0000000 --- a/changes/clear_trackexithost +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Fix a bug in the code where we could keep trying to use a - TrackHostExits-based mapping after we failed to reach the intended - destination node. Fixes bug 2999. Bugfix on 0.2.0.20-rc. - diff --git a/changes/connect_err_reporting b/changes/connect_err_reporting deleted file mode 100644 index 61a46b6..0000000 --- a/changes/connect_err_reporting +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes: - - Be more careful about reporting the correct error from a failed - connect() operation. Under some circumstances, it was possible to - look at an incorrect value for errno when sending the end reason. - Bugfix on Tor-0.1.0.1-rc. - diff --git a/changes/count_overflow b/changes/count_overflow deleted file mode 100644 index f302ff2..0000000 --- a/changes/count_overflow +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Correctly handle an "impossible" overflow cases in connection - byte counting, where we write or read more than 4GB on an edge - connection in single second. Bugfix on 0.1.2.8-beta. - diff --git a/changes/doxygen b/changes/doxygen deleted file mode 100644 index 5e5fcd1..0000000 --- a/changes/doxygen +++ /dev/null @@ -1,6 +0,0 @@ - o Documentation changes - - Modernize the doxygen configuration file slightly. Fixes bug 2707. - - Resolve all doxygen warnings except those for missing documentation. - Fixes bug 2705. - - Add doxygen documentation for more functions, fields, and types. - diff --git a/changes/exitnodes_reliable b/changes/exitnodes_reliable deleted file mode 100644 index 62ef03a..0000000 --- a/changes/exitnodes_reliable +++ /dev/null @@ -1,7 +0,0 @@ - o Minor features: - - If ExitNodes is set, still pay attention to the Fast/Stable - status of exits when picking exit nodes. (We used to ignore - these flags when ExitNodes was set, on the grounds that people - who set exitnodes wanted all of those nodes to get used, but - with the ability to pick exits by country and IP range, this - doesn't necessarily make sense any more.) diff --git a/changes/feature2711 b/changes/feature2711 deleted file mode 100644 index 7cdcfbf..0000000 --- a/changes/feature2711 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features - - Export GeoIP information on usage to bridge controller even if we have - not yet been running for 24 hours. - diff --git a/changes/forget-rend-descs-on-newnym b/changes/forget-rend-descs-on-newnym deleted file mode 100644 index da7afbe..0000000 --- a/changes/forget-rend-descs-on-newnym +++ /dev/null @@ -1,21 +0,0 @@ - o Security fixes: - - Forget all hidden service descriptors cached as a client when - processing a SIGNAL NEWNYM command. Fixes bug 3000. Bugfix on - 0.0.6. - o Major bugfixes: - - When we find that we have extended a hidden service's introduction - circuit to a relay which isn't listed as an introduction point in - the HS descriptor we currently have for the service, we now retry - one of the introduction points in the current HS descriptor. - Previously we would just give up. Bugfix on 0.2.0.10-alpha; fixes - bugs 1024 and 1930. - o Minor bugfixes: - - Don't allow v0 hidden service authorities to act as clients. - Required by fix for bug 3000. - - Ignore SIGNAL NEWNYM commands on relay-only Tor instances. - Required by fix for bug 3000. - o Code simplifications and refactoring: - - Allow rend_client_send_introduction to fail without closing the - AP connection permanently. - - diff --git a/changes/full_ap_circuits b/changes/full_ap_circuits deleted file mode 100644 index 379a1a1..0000000 --- a/changes/full_ap_circuits +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes - - When a client finds that an origin circuit has run out of 16-bit - stream IDs, we now mark it as unusable for new streams. - Previously, we would try to close the entire circuit. Bugfix on - Tor version 0.0.6. - diff --git a/changes/geoip-apr2011 b/changes/geoip-apr2011 deleted file mode 100644 index c38f8ae..0000000 --- a/changes/geoip-apr2011 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update to the April 1 2011 Maxmind GeoLite Country database. - diff --git a/changes/geoip-mar2011 b/changes/geoip-mar2011 deleted file mode 100644 index fda927f..0000000 --- a/changes/geoip-mar2011 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update to the March 1 2011 Maxmind GeoLite Country database. - diff --git a/changes/gmtime_null b/changes/gmtime_null deleted file mode 100644 index 16a2540..0000000 --- a/changes/gmtime_null +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes - - On some platforms, gmtime and localtime can return NULL under - certain circumstances even for well-defined values of time_t. - Try to detect and make up for this deficiency. Possible fix for - bug 2077. Bugfix on all versions of Tor. Found by boboper. - diff --git a/changes/hsdir_assignment b/changes/hsdir_assignment deleted file mode 100644 index 5c04b9b..0000000 --- a/changes/hsdir_assignment +++ /dev/null @@ -1,8 +0,0 @@ - o Security fixes: - - Directory authorities now use data collected from rephist when - choosing whether to assign the HSDir flag to relays, instead of - trusting the uptime value the relay reports in its descriptor. - This helps prevent an attack where a small set of nodes with - frequently-changing identity keys can blackhole a hidden service. - (Only authorities need upgrade; others will be fine once they do.) - Bugfix on 0.2.0.10-alpha; fixes bug 2709. diff --git a/changes/ipv6_crash b/changes/ipv6_crash deleted file mode 100644 index 02f8aaa..0000000 --- a/changes/ipv6_crash +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes: - - Fix a crash in parsing router descriptors containing IPv6 - addresses. This one crashed the directory authorities when somebody - fired up some experimental code. Bugfix on 0.2.1.3-alpha. diff --git a/changes/kill_ftime b/changes/kill_ftime deleted file mode 100644 index 47f4769..0000000 --- a/changes/kill_ftime +++ /dev/null @@ -1,7 +0,0 @@ - o Code simplification and refactoring - - Remove the old 'fuzzy time' logic. It was supposed to be used - for handling calculations where we have a known amount of clock - skew and an allowed amount of unknown skew. But we only used it - in three places, and we never adjusted the known/unknown skew - values. This is still something we might want to do someday, - but if we do, we'll want to do it differently. diff --git a/changes/log-typo-2011-03-15-01 b/changes/log-typo-2011-03-15-01 deleted file mode 100644 index 3830df3..0000000 --- a/changes/log-typo-2011-03-15-01 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes - - Fix a minor typo in a log message. Bugfix on 0.2.2.6-alpha. - diff --git a/changes/log_domains b/changes/log_domains deleted file mode 100644 index 7fc0506..0000000 --- a/changes/log_domains +++ /dev/null @@ -1,12 +0,0 @@ - o Minor features - - Make it simpler to specify "All log domains except for A and B". - Previously you needed to say "[*,~A,~B]". Now you can just say - "[~A,~B]". - - Add a LogMessageDomains option to include the domains of log messages - along with the messages. Without this, there's no way to use - log domains without reading the source or doing a lot of guessing - - o Documentation - - Add documentation for configuring logging at different severities in - different log domains. We've had this feature since 0.2.1.1-alpha, but - for some reason it never made it into the manpage. Fixes bug 2215. diff --git a/changes/microdesc-double-free b/changes/microdesc-double-free deleted file mode 100644 index 932cc75..0000000 --- a/changes/microdesc-double-free +++ /dev/null @@ -1,7 +0,0 @@ - o Security fixes: - - Don't double-free a parsable, but invalid, microdescriptor, even - if it is followed in the blob we're parsing by an unparsable - microdescriptor. Fixes an issue reported in a comment on bug 2954. - Bugfix on 0.2.2.6-alpha; fix by "cypherpunks". - - diff --git a/changes/noroute b/changes/noroute deleted file mode 100644 index 644deec..0000000 --- a/changes/noroute +++ /dev/null @@ -1,5 +0,0 @@ - - Minor features - - Send END_STREAM_REASON_NOROUTE in response to EHOSTUNREACH errors. - Clients before 0.2.1.27 didn't handle NOROUTE correctly, but - such clients are already deprecated because of security bugs. - diff --git a/changes/osx_forgotten_compilefix b/changes/osx_forgotten_compilefix deleted file mode 100644 index 754e09c..0000000 --- a/changes/osx_forgotten_compilefix +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Added a forgotten cast that caused a compile warning on OS X 10.6. Bugfix - on 0.2.2.24-alpha. - diff --git a/changes/ticket2497 b/changes/ticket2497 deleted file mode 100644 index 5117141..0000000 --- a/changes/ticket2497 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features: - - Ensure that no empty [dirreq-](read|write)-history lines are added - to an extrainfo document. Implements ticket 2497. - diff --git a/changes/torspec.git b/changes/torspec.git deleted file mode 100644 index ba33ca2..0000000 --- a/changes/torspec.git +++ /dev/null @@ -1,5 +0,0 @@ - o Packaging changes: - - Stop shipping the Tor specs files and development proposal documents - in the tarball. They are now in a separate git repository at - git://git.torproject.org/torspec.git - diff --git a/changes/win_tmp_dir b/changes/win_tmp_dir deleted file mode 100644 index 13f6e7f..0000000 --- a/changes/win_tmp_dir +++ /dev/null @@ -1,4 +0,0 @@ - o Unit tests: - - Use GetTempDir to find the proper temporary directory location on - Windows when generating temporary files for the unit tests. Patch - by Gisle Vanem. diff --git a/changes/zlib_aint_openssl b/changes/zlib_aint_openssl deleted file mode 100644 index dd8e10a..0000000 --- a/changes/zlib_aint_openssl +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes - - When warning about missing zlib development packages, give the - correct package names. Bugfix on 0.2.0.1-alpha.

1 0

r24691: {website} new tor -alpha version. (in website/trunk: . include)
by Andrew Lewman 29 Apr '11

29 Apr '11

Author: phobos Date: 2011-04-29 19:10:47 +0000 (Fri, 29 Apr 2011) New Revision: 24691 Modified: website/trunk/Makefile website/trunk/include/versions.wmi Log: new tor -alpha version. Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2011-04-29 17:34:37 UTC (rev 24690) +++ website/trunk/Makefile 2011-04-29 19:10:47 UTC (rev 24691) @@ -11,8 +11,8 @@ # 5. ./publish export TORGIT=/home/runa/dev/tor/.git -export STABLETAG=tor-0.2.2.24-alpha -export DEVTAG=tor-0.2.2.24-alpha +export STABLETAG=tor-0.2.2.25-alpha +export DEVTAG=tor-0.2.2.25-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-04-29 17:34:37 UTC (rev 24690) +++ website/trunk/include/versions.wmi 2011-04-29 19:10:47 UTC (rev 24691) @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-alpha whitespace=delete>0.2.2.24-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.2.2.25-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.1.30</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.2.24-alpha</define-tag>

1 0

r24690: {website} admit the existence of torbutton (website/trunk/download/en)
by Roger Dingledine 29 Apr '11

29 Apr '11

Author: arma Date: 2011-04-29 17:34:37 +0000 (Fri, 29 Apr 2011) New Revision: 24690 Modified: website/trunk/download/en/download.wml Log: admit the existence of torbutton Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-04-29 16:22:07 UTC (rev 24689) +++ website/trunk/download/en/download.wml 2011-04-29 17:34:37 UTC (rev 24690) @@ -23,7 +23,7 @@ <td>The Tor Software for Windows comes bundled in four different ways: <ul> <li>The Tor Browser Bundle contains everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></li> -<li>The Vidalia Bundle contains Tor, <a href="<page projects/vidalia>">Vidalia</a>, and Polipo for installation on your system. You need to configure your applications to use Tor.</li> +<li>The Vidalia Bundle contains Tor, <a href="<page projects/vidalia>">Vidalia</a>, Polipo, and Torbutton for installation on your system. You need your own Firefox, and you'll need to configure other applications if you want them to use Tor.</li> <li>The Bridge-by-Default Vidalia Bundle is a Vidalia Bundle which is configured to be a <a href="<page docs/bridges>">bridge</a> in order to help censored users reach the Tor network. <li>The Expert Package contains just Tor and nothing else. You'll need to configure Tor and all of your applications manually.</li> </ul> @@ -84,7 +84,7 @@ <td class="intro">The Tor Software for OS X comes bundled in two different ways: <ul> <li>The Tor Browser Bundle contains everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></li> -<li>The Vidalia Bundle contains Tor, <a href="<page projects/vidalia>">Vidalia</a>, and Polipo for installation on your system. You need to configure your applications to use Tor.</li> +<li>The Vidalia Bundle contains Tor, <a href="<page projects/vidalia>">Vidalia</a>, Polipo, and Torbutton for installation on your system. You need your own Firefox, and you'll need to configure other applications if you want them to use Tor.</li> </ul> There are two versions of each package, a stable and alpha release. Stable packages are released when we believe the features and code will not change for many months. Alpha or unstable packages are released so you can help us test new features and bugfixes. Even though they have a higher version number than the stable versions listed above, there is a much higher chance of serious reliability and security bugs in these downloads. Please be prepared to <a href="https://bugs.torproject.org/">report bugs</a>. The current stable version of Tor for OS X is <version-osx-x86-stable>. The current alpha/unstable version of Tor for OS X is <version-osx-x86-alpha>.

1 0

r24689: {website} consistent capitalization (website/trunk/download/en)
by Roger Dingledine 29 Apr '11

29 Apr '11

Author: arma Date: 2011-04-29 16:22:07 +0000 (Fri, 29 Apr 2011) New Revision: 24689 Modified: website/trunk/download/en/download.wml Log: consistent capitalization Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-04-29 14:09:29 UTC (rev 24688) +++ website/trunk/download/en/download.wml 2011-04-29 16:22:07 UTC (rev 24689) @@ -28,7 +28,7 @@ <li>The Expert Package contains just Tor and nothing else. You'll need to configure Tor and all of your applications manually.</li> </ul> There are two versions of each package, a stable and alpha release. Stable packages are released when we believe the features and code will not change for many months. Alpha or unstable packages are released so you can help us test new features and bugfixes. Even though they have a higher version number than the stable versions listed above, there is a much higher chance of serious reliability and security bugs in these downloads. Please be prepared to <a href="https://bugs.torproject.org/">report bugs</a>. -The current stable version of Tor for Windows is <version-win32-stable>. The current alpha/unstable version of tor for Windows is <version-win32-alpha>. +The current stable version of Tor for Windows is <version-win32-stable>. The current alpha/unstable version of Tor for Windows is <version-win32-alpha>. </td> </tr> <tr class="gray">

1 0

[tor/master] add another heuristic for changes stanzas
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit 93b0183d3cae436732b48d36aa9b54964854a0a4 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Apr 29 01:35:21 2011 -0400 add another heuristic for changes stanzas --- doc/HACKING | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index 6407ff2..6336232 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -444,6 +444,10 @@ interesting and understandable. Present and imperative tense: not past. + If a given changes stanza showed up in a different release (e.g. + maint-0.2.1), be sure to make the stanzas identical (so people can + distinguish if these are the same change). + 2.5) Merge them in. 2.6) Clean everything one last time.

1 0

[tor/master] Update hacking file with terse notes on formatting changelog
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit 676190e895a94978fbda82527f7ba2dbf8ccda80 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 23:44:48 2011 -0400 Update hacking file with terse notes on formatting changelog --- doc/HACKING | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index b612953..6407ff2 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -414,10 +414,43 @@ Here are the steps Roger takes when putting out a new Tor release: and as a directory authority. See if it has any obvious bugs, and resolve those. +1.5) As applicable, merge the maint-X branch into the release-X branch. + 2) Gather the changes/* files into a changelog entry, rewriting many of them and reordering to focus on what users and funders would find interesting and understandable. + 2.1) Make sure that everything that wants a bug number has one. + 2.2) Concatenate them. + 2.3) Sort them by section. Within each section, try to make the + first entry or two and the last entry most interesting: they're + the ones that skimmers tend to read. + + 2.4) Clean them up + + Standard idioms: + "Fixes bug 9999; Bugfix on 0.3.3.3-alpha." + + One period after a space. + + Make stuff very terse + + Describe the user-visible problem right away + + Mention relevant config options by name. If they're rare or unusual, + remind people what they're for + + Avoid starting lines with open-paren + + Present and imperative tense: not past. + + 2.5) Merge them in. + + 2.6) Clean everything one last time. + + 2.7) Run it through fmt to make it pretty. + + 3) Compose a short release blurb to highlight the user-facing changes. Insert said release blurb into the ChangeLog stanza. If it's a stable release, add it to the ReleaseNotes file too. If we're adding

1 0

[tor/master] Clean up a warning a bit
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit dbd73b9689e8008adc149472ca5c02692a49923d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 29 11:14:53 2011 -0400 Clean up a warning a bit --- src/or/config.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 8671822..666a1bd 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3488,10 +3488,9 @@ options_validate(or_options_t *old_options, or_options_t *options, } if (options->CookieAuthFileGroupReadable && !options->CookieAuthFile) { - log_warn(LD_CONFIG, "You set the CookieAuthFileGroupReadable but did " - "not configure a the path for the cookie file via " - "CookieAuthFile. This means your cookie will not be group " - "readable."); + log_warn(LD_CONFIG, "CookieAuthFileGroupReadable is set, but will have " + "no effect: you must specify an explicit CookieAuthFile to " + "have it group-readable."); } if (options->UseEntryGuards && ! options->NumEntryGuards)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit c48d6da24c403f6a9f8240035e8c1114cdd2eb13 Merge: daede6f dbd73b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 29 11:15:11 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' doc/HACKING | 37 +++++++++++++++++++++++++++++++++++++ src/or/config.c | 7 +++---- 2 files changed, 40 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.2.2] Clean up a warning a bit
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit dbd73b9689e8008adc149472ca5c02692a49923d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 29 11:14:53 2011 -0400 Clean up a warning a bit --- src/or/config.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 8671822..666a1bd 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3488,10 +3488,9 @@ options_validate(or_options_t *old_options, or_options_t *options, } if (options->CookieAuthFileGroupReadable && !options->CookieAuthFile) { - log_warn(LD_CONFIG, "You set the CookieAuthFileGroupReadable but did " - "not configure a the path for the cookie file via " - "CookieAuthFile. This means your cookie will not be group " - "readable."); + log_warn(LD_CONFIG, "CookieAuthFileGroupReadable is set, but will have " + "no effect: you must specify an explicit CookieAuthFile to " + "have it group-readable."); } if (options->UseEntryGuards && ! options->NumEntryGuards)

1 0