diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-06 16:13:22 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-06 16:13:22 -0400 |
| commit | 32341ac467d5fe51fa674eed4ca20db61ff5486b (patch) | |
| tree | ebf2e0eb03a837bcf625981ba60abc606941a5e5 /changes | |
| parent | 0cdd2629418f019bda5fa2daa271aae4f7131fa6 (diff) | |
| parent | 02d93caa09656b1ef73838608258afad5c090105 (diff) | |
| download | tor-32341ac467d5fe51fa674eed4ca20db61ff5486b.tar.gz tor-32341ac467d5fe51fa674eed4ca20db61ff5486b.zip | |
Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug2402 | 4 | ||||
| -rw-r--r-- | changes/bug2402_redux | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/changes/bug2402 b/changes/bug2402 deleted file mode 100644 index f16f6773e7..0000000000 --- a/changes/bug2402 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (build) - - Do not include Git version tags as though they were SVN tags when - generating a tarball from inside a repository that has switched between - branches. Bugfix on 0.2.1.15-rc; fixes bug 2402. diff --git a/changes/bug2402_redux b/changes/bug2402_redux new file mode 100644 index 0000000000..84be04a021 --- /dev/null +++ b/changes/bug2402_redux @@ -0,0 +1,6 @@ + o Minor bugfixes + - Use micro-revision numbers in 0.2.1.x instead: apparently, they + were more used than we had known. (Bugfix on 0.2.1.30). + - Instead of generating our micro-version numbers using SVN revisions, + use git revisions instead. Bugfix on 0.2.1.15-rc; fixes bug 2402. + |