Commit 671318c3 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Revert "Simplest fix to bug2402: do not include SVN versions" 

This reverts commit a1073ee9.

Apparently, we totally misunderstood how the debian packages were using
microrevisions.  Better fix that!
parent d080fe8d

changes/bug2402

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
  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.

src/or/config.c

+10 −1
Original line number Diff line number Diff line
@@ -827,7 +827,16 @@ static char *_version = NULL; 
const char *

get_version(void)

{

  return VERSION;

  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;

}



/** Release additional memory allocated in options