tor/src/or
Roger Dingledine d4a61c76a1 Merge branch 'maint-0.2.2'
Conflicts:
	src/or/dirserv.h
2011-04-27 15:21:27 -04:00
..
buffers.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-04-07 12:17:20 -04:00
buffers.h Merge remote branch 'origin/maint-0.2.2' 2011-01-03 11:53:28 -05:00
circuitbuild.c Merge maint-0.2.2 for the bug1090-part1-squashed branch 2011-04-27 14:36:30 -04:00
circuitbuild.h Merge branch 'maint-0.2.2' 2011-01-15 22:39:15 -05:00
circuitlist.c Merge maint-0.2.2 for the bug1090-part1-squashed branch 2011-04-27 14:36:30 -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 branch 'maint-0.2.2' 2011-04-27 15:21:27 -04:00
circuituse.h Merge maint-0.2.2 for the bug1090-part1-squashed branch 2011-04-27 14:36:30 -04:00
command.c Revert bug1074_launch_authconn* branch: needs more design, less crashing 2011-02-28 12:58:29 -05: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 maint-0.2.2 for the bug1090-part1-squashed branch 2011-04-27 14:36:30 -04:00
config.h Merge remote branch 'origin/maint-0.2.2' 2011-01-03 11:53:28 -05:00
connection_edge.c Merge maint-0.2.2 for the bug1090-part1-squashed branch 2011-04-27 14:36:30 -04:00
connection_edge.h Merge maint-0.2.2 for the bug1090-part1-squashed branch 2011-04-27 14:36:30 -04:00
connection_or.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-04-07 12:17:20 -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-04-07 12:17:20 -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-04-26 15:30:51 -04:00
control.h Merge remote branch 'origin/maint-0.2.2' 2011-01-03 11:53:28 -05:00
cpuworker.c Merge remote branch 'origin/maint-0.2.2' 2011-01-03 12:47:58 -05:00
cpuworker.h Bump copyright statements to 2011 (0.2.2) 2011-01-03 11:52:09 -05:00
directory.c Merge maint-0.2.2 for the bug1090-part1-squashed branch 2011-04-27 14:36:30 -04:00
directory.h Merge remote branch 'origin/maint-0.2.2' 2011-01-03 11:53:28 -05:00
dirserv.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-04-07 12:17:20 -04:00
dirserv.h make make check-spaces happier. 2011-04-27 15:18:34 -04:00
dirvote.c Merge remote branch 'origin/maint-0.2.2' 2011-03-11 23:34:46 -05:00
dirvote.h Merge branch 'maint-0.2.2' 2011-01-15 22:39:15 -05:00
dns.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-04-07 12:17:20 -04:00
dns.h Bump copyright statements to 2011 (0.2.2) 2011-01-03 11:52:09 -05:00
dnsserv.c Merge remote-tracking branch 'public/bug2332' into maint-0.2.2 2011-04-26 13:10:54 -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-04-26 13:12:43 -04:00
eventdns.h Make eventdns server functions const void* to match libevent 2011-01-10 16:00:48 -05: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 Log more about soft-hibernation 2011-01-25 18:45:13 -05: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-04-26 15:30:51 -04:00
main.h Merge remote-tracking branch 'origin/maint-0.2.2' 2011-04-26 15:30:51 -04:00
Makefile.am Ouch: correctly tabify the micro-revision.i target in Makefile.am (0.2.1 only) 2011-04-19 12:29:20 -04:00
microdesc.c Fix memory leak in md-download logic 2011-02-24 09:47:33 -05:00
microdesc.h Merge remote branch 'origin/maint-0.2.2' 2011-01-03 11:53:28 -05:00
networkstatus.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-04-07 12:17:20 -04:00
networkstatus.h Merge branch 'maint-0.2.2' 2011-01-15 22:39:15 -05:00
nodelist.c Bump copyright statements to 2011 (master) 2011-01-03 11:55:01 -05: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 Make the DH parameter we use for TLS match the one from Apache's mod_ssl 2011-02-10 15:55:06 -05:00
onion.h Bump copyright statements to 2011 (0.2.2) 2011-01-03 11:52:09 -05:00
or.h Merge maint-0.2.2 for the bug1090-part1-squashed branch 2011-04-27 14:36:30 -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-04-07 12:17:20 -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 maint-0.2.2 for the bug1090-part1-squashed branch 2011-04-27 14:36:30 -04:00
rendclient.h Instead of checking whether we have unremoved intro points, check for usable ones 2011-04-27 00:01:41 -04:00
rendcommon.c Merge maint-0.2.2 for the bug1090-part1-squashed branch 2011-04-27 14:36:30 -04:00
rendcommon.h change APIs slightly to make #1944 easier 2011-02-07 06:39:21 -05:00
rendmid.c Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 2011-01-03 11:58:59 -05:00
rendmid.h Bump copyright statements to 2011 (0.2.2) 2011-01-03 11:52:09 -05:00
rendservice.c Merge maint-0.2.2 for the bug1090-part1-squashed branch 2011-04-27 14:36:30 -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-04-26 12:49:58 -04:00
rephist.h Merge remote branch 'origin/maint-0.2.2' 2011-03-11 23:34:46 -05:00
router.c Merge maint-0.2.2 for the bug1090-part1-squashed branch 2011-04-27 14:36:30 -04:00
router.h Merge remote branch 'origin/maint-0.2.2' 2011-01-03 11:53:28 -05:00
routerlist.c Merge maint-0.2.2 for the bug1090-part1-squashed branch 2011-04-27 14:36:30 -04:00
routerlist.h Merge maint-0.2.2 for the bug1090-part1-squashed branch 2011-04-27 14:36:30 -04:00
routerparse.c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-04-27 15:20:01 -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 Reuse get_bytes_{read,written}() in status.c 2011-04-16 14:48:46 +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