nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 05:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix a bug, defer a bug, bump to 0.1.2.5-alpha

Browse Source 
svn:r9270
This commit is contained in:
Roger Dingledine 2007-01-05 06:30:31 +00:00
parent 658c09c06f
commit ee0d2d486d
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -4,7 +4,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
dnl See LICENSE for licensing information
AC_INIT
AM_INIT_AUTOMAKE(tor, 0.1.2.4-alpha-dev)
AM_INIT_AUTOMAKE(tor, 0.1.2.5-alpha)
AM_CONFIG_HEADER(orconfig.h)
AC_CANONICAL_HOST

2
contrib/tor-mingw.nsi.in
View File

@ -5,7 +5,7 @@
;
!include "MUI.nsh"
!define VERSION "0.1.2.4-alpha-dev"
!define VERSION "0.1.2.5-alpha"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "http://tor.eff.org/"

3
src/or/directory.c
View File

@ -1639,8 +1639,7 @@ directory_handle_command_get(dir_connection_t *conn, char *headers,
smartlist_free(dir_fps);
return 0;
}
dlen = dirserv_estimate_data_size(conn->fingerprint_stack,
0, deflated);
dlen = dirserv_estimate_data_size(dir_fps, 0, deflated);
if (global_write_bucket_low(dlen, 2)) {
log_info(LD_DIRSERV,
"Client asked for server descriptors, but we've been "

1
src/or/dirserv.c
View File

@ -1900,6 +1900,7 @@ dirserv_estimate_data_size(smartlist_t *fps, int is_serverdescs,
int compressed)
{
size_t result;
tor_assert(fps);
if (is_serverdescs) {
int n = smartlist_len(fps);
routerinfo_t *me = router_get_my_routerinfo();

5
src/or/dns.c
View File

@ -923,8 +923,9 @@ dns_found_answer(const char *address, int is_reverse, uint32_t addr,
if (resolve->state != CACHE_STATE_PENDING) {
/* XXXX Maybe update addr? or check addr for consistency? Or let
* VALID replace FAILED? */
log_notice(LD_EXIT, "Resolved %s which was already resolved; ignoring",
escaped_safe_str(address));
log_info(LD_EXIT, "Resolved %s which was already resolved; ignoring",
escaped_safe_str(address));
/* XXXX012 this triggers in ordinary life. nick says it's a bug. */
tor_assert(resolve->pending_connections == NULL);
return;
}

2
src/win32/orconfig.h
View File

@ -227,5 +227,5 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
#define VERSION "0.1.2.4-alpha-dev"
#define VERSION "0.1.2.5-alpha"