diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2011-10-27 00:15:25 +0200 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2011-10-27 00:38:45 +0200 |
| commit | 2dec6597af4014eb731d8caac55a8a87964ce371 (patch) | |
| tree | bb2b9020ab2d67f46a619026530c57ec607c07bb /src/or/routerparse.c | |
| parent | 2c4e89b86703f188f45f9edfc0fd3e4bbeac3511 (diff) | |
| parent | 4684ced1b3fced0543fa65bf01f75c5d81eaf464 (diff) | |
| download | tor-2dec6597af4014eb731d8caac55a8a87964ce371.tar.gz tor-2dec6597af4014eb731d8caac55a8a87964ce371.zip | |
Merge branch 'maint-0.2.2_secfix' into master_secfix
Conflicts:
src/common/tortls.c
src/or/connection_or.c
src/or/dirserv.c
src/or/or.h
Diffstat (limited to 'src/or/routerparse.c')
| -rw-r--r-- | src/or/routerparse.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 6fd8db296d..e8b2dd7d2b 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -570,7 +570,6 @@ static int check_signature_token(const char *digest, int flags, const char *doctype); static crypto_pk_env_t *find_dir_signing_key(const char *str, const char *eos); -static int tor_version_same_series(tor_version_t *a, tor_version_t *b); #undef DEBUG_AREA_ALLOC @@ -4568,7 +4567,7 @@ tor_version_compare(tor_version_t *a, tor_version_t *b) /** Return true iff versions <b>a</b> and <b>b</b> belong to the same series. */ -static int +int tor_version_same_series(tor_version_t *a, tor_version_t *b) { tor_assert(a); |