sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'public/bug7143_v2' into maint-0.2.4

This commit is contained in:
Nick Mathewson 2013-04-17 10:49:59 -04:00
parent 42731f69ef 3dc52e6636
commit b00a6211c5
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug7143 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (build):
- Add the old src/or/micro-revision.i filename to CLEANFILES.
On the off chance that somebody has one, it will go away as soon
as they run "make clean". Fix for bug 7143; bugfix on 0.2.4.1-alpha.

2
src/or/include.am
View File

@ -188,6 +188,6 @@ src/or/or_sha1.i: $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES) $(ORHEADERS)
touch src/or/or_sha1.i; \
fi
CLEANFILES+= micro-revision.i
CLEANFILES+= micro-revision.i src/or/micro-revision.i
FORCE: