diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-22 15:54:13 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-22 15:54:13 -0500 |
| commit | 7605985b3ff71cee7fabdf023baf298b218d04c1 (patch) | |
| tree | 0a124e5b052511bddb040a49d18f3a0383ed57a6 | |
| parent | 372773d681ed0f67e824cf2eef41a7186ab6c458 (diff) | |
| parent | a1073ee956021ead19d30c2151510dbaced416a8 (diff) | |
| download | tor-7605985b3ff71cee7fabdf023baf298b218d04c1.tar.gz tor-7605985b3ff71cee7fabdf023baf298b218d04c1.zip | |
Merge remote branch 'public/bug2402_nothing' into maint-0.2.1
| -rw-r--r-- | changes/bug2402 | 4 | ||||
| -rw-r--r-- | src/or/config.c | 11 |
2 files changed, 5 insertions, 10 deletions
diff --git a/changes/bug2402 b/changes/bug2402 new file mode 100644 index 0000000000..f16f6773e7 --- /dev/null +++ b/changes/bug2402 @@ -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. diff --git a/src/or/config.c b/src/or/config.c index 8397b231a3..209a92d159 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -827,16 +827,7 @@ static char *_version = NULL; const char * get_version(void) { - if (_version == NULL) { - 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; + return VERSION; } /** Release additional memory allocated in options |