nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 06:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'public/bug2402_nothing' into maint-0.2.1

Browse Source
This commit is contained in:
Nick Mathewson 2011-02-22 15:54:13 -05:00
commit 7605985b3f
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug2402 Normal file
View File

@ -0,0 +1,4 @@
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.

11
src/or/config.c
View File

@ -827,16 +827,7 @@ static char *_version = NULL;
const char * const char *
get_version(void) get_version(void)
{ {
if (_version == NULL) { return VERSION;
if (strlen(tor_svn_revision)) {
size_t len = strlen(VERSION)+strlen(tor_svn_revision)+8;
_version = tor_malloc(len);
tor_snprintf(_version, len, "%s (r%s)", VERSION, tor_svn_revision);
} else {
_version = tor_strdup(VERSION);
}
}
return _version;
} }
/** Release additional memory allocated in options /** Release additional memory allocated in options