torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.2_secfix' into master_secfix

Browse Source 
Conflicts:
	src/common/tortls.c
	src/or/connection_or.c
	src/or/dirserv.c
	src/or/or.h
This commit is contained in:
Sebastian Hahn
2011-10-27 00:15:25 +02:00
parent 2c4e89b867 4684ced1b3
commit 2dec6597af
10 changed files with 212 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/routerparse.c
+1 -2
View File
@@ -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);