aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-01-25 14:01:04 -0500
committerNick Mathewson <nickm@torproject.org>2011-03-11 11:01:17 -0500
commit02d93caa09656b1ef73838608258afad5c090105 (patch)
tree279e7cc4cf69fba35324bc48ce6b8b6c908e096d /src/or/config.c
parent671318c3a84657acc8b97cf59871489065264ece (diff)
downloadtor-02d93caa09656b1ef73838608258afad5c090105.tar.gz
tor-02d93caa09656b1ef73838608258afad5c090105.zip
Backport: Generate version tags using Git, not (broken) svn revisions.
Partial backport of daa0326aaaa85a760be94ee2360cfa61a9fb5be2 . Resolves bug 2402. Bugfix on 0.2.1.15 (for the part where we switched to git) and on 0.2.1.30 (for the part where we dumped micro-revisions.)
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 8397b231a3..9cd8149ce8 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -829,9 +829,9 @@ get_version(void)
{
if (_version == NULL) {
if (strlen(tor_svn_revision)) {
- size_t len = strlen(VERSION)+strlen(tor_svn_revision)+8;
+ size_t len = strlen(VERSION)+strlen(tor_svn_revision)+16;
_version = tor_malloc(len);
- tor_snprintf(_version, len, "%s (r%s)", VERSION, tor_svn_revision);
+ tor_snprintf(_version, len, "%s (git-%s)", VERSION, tor_svn_revision);
} else {
_version = tor_strdup(VERSION);
}