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 remote-tracking branch 'origin/maint-0.2.2'

Browse Source 
The conflicts were mainly caused by the routerinfo->node transition.

Conflicts:
	src/or/circuitbuild.c
	src/or/command.c
	src/or/connection_edge.c
	src/or/directory.c
	src/or/dirserv.c
	src/or/relay.c
	src/or/rendservice.c
	src/or/routerlist.c
This commit is contained in:
Nick Mathewson
2011-05-30 15:41:46 -04:00
parent 21de9d46e2 7f0fb8e608
commit fa1d47293b
19 changed files with 339 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/compat_libevent.h
+1 -4
View File
@@ -12,15 +12,12 @@ struct event_base;
struct bufferevent;
#endif
#ifdef HAVE_EVENT2_EVENT_H
#include <event2/util.h>
#else
#ifndef EVUTIL_SOCKET_DEFINED
#elif !defined(EVUTIL_SOCKET_DEFINED)
#define EVUTIL_SOCKET_DEFINED
#define evutil_socket_t int
#endif
#endif
void configure_libevent_logging(void);
void suppress_libevent_log_msg(const char *msg);
src/common/util.h
+1 -1
View File
@@ -276,7 +276,7 @@ typedef struct ratelim_t {
char *rate_limit_log(ratelim_t *lim, time_t now);
/* File helpers */
ssize_t write_all(tor_socket_t fd, const char *buf, size_t count, int isSocket);
ssize_t write_all(tor_socket_t fd, const char *buf, size_t count,int isSocket);
ssize_t read_all(tor_socket_t fd, char *buf, size_t count, int isSocket);
/** Return values from file_status(); see that function's documentation