nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 13:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
fa1d47293b
tor/src/or
History
Nick Mathewson fa1d47293b Merge remote-tracking branch 'origin/maint-0.2.2' 
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
2011-05-30 15:41:46 -04:00
..
buffers.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 14:58:26 -04:00
buffers.h Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 14:58:26 -04:00
circuitbuild.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 15:41:46 -04:00
circuitbuild.h Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-15 20:17:17 -04:00
circuitlist.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 15:41:46 -04:00
circuitlist.h Add a circuit_purpose_to_string() function, and use it 2011-04-27 00:01:35 -04:00
circuituse.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 15:41:46 -04:00
circuituse.h Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-15 11:44:51 -04:00
command.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 15:41:46 -04:00
command.h Bump copyright statements to 2011 (0.2.2) 2011-01-03 11:52:09 -05:00
config_codedigest.c fix codestyle issues 2009-05-24 02:42:37 +02:00
config.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 12:43:25 -04:00
config.h Merge remote-tracking branch 'origin/maint-0.2.2' 2011-04-28 20:55:03 -04:00
connection_edge.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 15:41:46 -04:00
connection_edge.h Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-15 11:44:51 -04:00
connection_or.c Merge remote-tracking branch 'public/bug3122_memcmp_022' into bug3122_memcmp_023 2011-05-11 16:39:45 -04:00
connection_or.h Bump copyright statements to 2011 (0.2.2) 2011-01-03 11:52:09 -05:00
connection.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 14:58:26 -04:00
connection.h Merge remote branch 'origin/maint-0.2.2' 2011-01-03 11:53:28 -05:00
control.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 14:58:26 -04:00
control.h Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-23 01:23:53 -04:00
cpuworker.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 14:58:26 -04:00
cpuworker.h Bump copyright statements to 2011 (0.2.2) 2011-01-03 11:52:09 -05:00
directory.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 15:41:46 -04:00
directory.h Code to make clients fetch and use microdescriptors for circuit building 2011-05-05 20:54:12 -04:00
dirserv.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 15:41:46 -04:00
dirserv.h make make check-spaces happier. 2011-04-27 15:18:34 -04:00
dirvote.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-28 01:55:34 -04:00
dirvote.h Merge branch 'maint-0.2.2' 2011-01-15 22:39:15 -05:00
dns.c Merge branch 'maint-0.2.2' 2011-05-20 03:03:46 -04:00
dns.h Bump copyright statements to 2011 (0.2.2) 2011-01-03 11:52:09 -05:00
dnsserv.c Use a 64-bit type to hold sockets on win64. 2011-05-23 00:17:48 -04:00
dnsserv.h Bump copyright statements to 2011 (0.2.2) 2011-01-03 11:52:09 -05:00
eventdns_tor.h Bump copyright statements to 2011 2011-01-03 11:50:39 -05:00
eventdns.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 14:58:26 -04:00
eventdns.h Use a 64-bit type to hold sockets on win64. 2011-05-23 00:17:48 -04:00
geoip.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-04-07 12:17:20 -04:00
geoip.h Merge remote-tracking branch 'origin/maint-0.2.2' 2011-04-07 11:55:17 -04:00
hibernate.c Correctly check elapsed time in last hibernation period 2011-04-29 01:18:32 +02:00
hibernate.h Bump copyright statements to 2011 (0.2.2) 2011-01-03 11:52:09 -05:00
main.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 14:58:26 -04:00
main.h Merge remote-tracking branch 'origin/maint-0.2.2' 2011-04-26 15:30:51 -04:00
Makefile.am Link to libevent_openssl statically when requested 2011-05-06 15:38:32 +02:00
microdesc.c Merge remote-tracking branch 'public/bug3122_memcmp_023' 2011-05-12 19:27:18 -04:00
microdesc.h Code to make clients fetch and use microdescriptors for circuit building 2011-05-05 20:54:12 -04:00
networkstatus.c Fixup whitespace issues from 3122 commit 2011-05-15 20:06:36 -04:00
networkstatus.h Merge branch 'maint-0.2.2' 2011-01-15 22:39:15 -05:00
nodelist.c Hand-tune the new tor_memcmp instances in 0.2.3 2011-05-11 16:46:38 -04:00
nodelist.h Bump copyright statements to 2011 (master) 2011-01-03 11:55:01 -05:00
ntmain.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-03-16 17:09:32 -04:00
ntmain.h Bump copyright statements to 2011 (0.2.2) 2011-01-03 11:52:09 -05:00
onion.c Merge remote-tracking branch 'public/3122_memcmp_squashed' into bug3122_memcmp_022 2011-05-11 16:24:29 -04:00
onion.h Bump copyright statements to 2011 (0.2.2) 2011-01-03 11:52:09 -05:00
or.h Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 14:58:26 -04:00
policies.c Merge remote branch 'origin/maint-0.2.2' 2011-03-06 13:23:02 -05:00
policies.h Merge remote branch 'origin/maint-0.2.2' 2011-02-22 14:10:42 -05:00
reasons.c Send END_STREAM_REASON_NOROUTE: clients that didn't grok it are now obsolete 2011-03-28 13:42:59 -04:00
reasons.h Bump copyright statements to 2011 (0.2.2) 2011-01-03 11:52:09 -05:00
relay.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 15:41:46 -04:00
relay.h Move the decl for tor_gettimofday_cache_clear to the right header 2011-03-16 17:54:48 -04:00
rendclient.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 15:41:46 -04:00
rendclient.h Merge branch 'bug3k_021' into bug3k_022 2011-04-28 19:00:34 +02:00
rendcommon.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-16 14:50:53 -04:00
rendcommon.h Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-16 14:50:53 -04:00
rendmid.c Merge remote-tracking branch 'public/3122_memcmp_squashed' into bug3122_memcmp_022 2011-05-11 16:24:29 -04:00
rendmid.h Bump copyright statements to 2011 (0.2.2) 2011-01-03 11:52:09 -05:00
rendservice.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 15:41:46 -04:00
rendservice.h Bump copyright statements to 2011 (0.2.2) 2011-01-03 11:52:09 -05:00
rephist.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 15:41:46 -04:00
rephist.h Merge remote branch 'origin/maint-0.2.2' 2011-03-11 23:34:46 -05:00
router.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 15:41:46 -04:00
router.h Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 15:41:46 -04:00
routerlist.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 15:41:46 -04:00
routerlist.h Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 15:41:46 -04:00
routerparse.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-05-30 15:41:46 -04:00
routerparse.h Move the decl for tor_gettimofday_cache_clear to the right header 2011-03-16 17:54:48 -04:00
status.c Fix bug3183 2011-05-15 03:13:52 +02:00
status.h Implement more heartbeat message stuff. 2011-02-22 12:40:38 -05:00
tor_main.c Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 2011-01-03 11:51:17 -05:00