Nick Mathewson ee871e7a0e Merge remote-tracking branch 'origin/maint-0.2.2' 13 vuotta sitten
..
Makefile.am ee95430d39 Implement more heartbeat message stuff. 13 vuotta sitten
buffers.c 71d786b2d3 Merge branch 'bug2320' 13 vuotta sitten
buffers.h 8730884ebe Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
circuitbuild.c 57b954293e Merge remote-tracking branch 'origin/maint-0.2.2' 13 vuotta sitten
circuitbuild.h 4ff97e3775 Merge branch 'maint-0.2.2' 13 vuotta sitten
circuitlist.c ee871e7a0e Merge remote-tracking branch 'origin/maint-0.2.2' 13 vuotta sitten
circuitlist.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 vuotta sitten
circuituse.c ee871e7a0e Merge remote-tracking branch 'origin/maint-0.2.2' 13 vuotta sitten
circuituse.h ee871e7a0e Merge remote-tracking branch 'origin/maint-0.2.2' 13 vuotta sitten
command.c 42c1a47123 Revert bug1074_launch_authconn* branch: needs more design, less crashing 13 vuotta sitten
command.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 vuotta sitten
config.c 1db6eb6cb7 Merge remote-tracking branch 'origin/maint-0.2.2' 13 vuotta sitten
config.h 8730884ebe Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
config_codedigest.c f26abf5f54 fix codestyle issues 15 vuotta sitten
connection.c 415caba967 Merge remote branch 'arma/optimistic_server' 13 vuotta sitten
connection.h 8730884ebe Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
connection_edge.c 737228ed8e Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
connection_edge.h 737228ed8e Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
connection_or.c 57b954293e Merge remote-tracking branch 'origin/maint-0.2.2' 13 vuotta sitten
connection_or.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 vuotta sitten
control.c 2be65619f9 Fix wide lines in control.c 13 vuotta sitten
control.h 8730884ebe Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
cpuworker.c 394a6bf4cd Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
cpuworker.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 vuotta sitten
directory.c 84f27eb051 Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
directory.h 8730884ebe Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
dirserv.c f1c365b032 Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
dirserv.h f1c365b032 Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
dirvote.c d52a99dc77 Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
dirvote.h 4ff97e3775 Merge branch 'maint-0.2.2' 13 vuotta sitten
dns.c 468da1c28a Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
dns.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 vuotta sitten
dnsserv.c 9d133464c8 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 13 vuotta sitten
dnsserv.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 vuotta sitten
eventdns.c 394a6bf4cd Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
eventdns.h aea9cf1011 Fix compile warnings on Snow Leopard 15 vuotta sitten
eventdns_tor.h 1a07348a50 Bump copyright statements to 2011 13 vuotta sitten
geoip.c 8b393afa94 Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
geoip.h 8730884ebe Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
hibernate.c 5ce8182bdb Log more about soft-hibernation 13 vuotta sitten
hibernate.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 vuotta sitten
main.c ee871e7a0e Merge remote-tracking branch 'origin/maint-0.2.2' 13 vuotta sitten
main.h 57b954293e Merge remote-tracking branch 'origin/maint-0.2.2' 13 vuotta sitten
microdesc.c 0a6beb9368 Fix memory leak in md-download logic 13 vuotta sitten
microdesc.h 8730884ebe Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
networkstatus.c 4ff97e3775 Merge branch 'maint-0.2.2' 13 vuotta sitten
networkstatus.h 4ff97e3775 Merge branch 'maint-0.2.2' 13 vuotta sitten
nodelist.c a1ceee193b Bump copyright statements to 2011 (master) 13 vuotta sitten
nodelist.h a1ceee193b Bump copyright statements to 2011 (master) 13 vuotta sitten
ntmain.c 57b954293e Merge remote-tracking branch 'origin/maint-0.2.2' 13 vuotta sitten
ntmain.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 vuotta sitten
onion.c 76582442a8 Handle failing cases of DH allocation 13 vuotta sitten
onion.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 vuotta sitten
or.h 57b954293e Merge remote-tracking branch 'origin/maint-0.2.2' 13 vuotta sitten
policies.c 07b8b439c4 Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
policies.h b7f201f746 Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
reasons.c 411ec3c0f8 Add client code to detect attempts to connect to 127.0.0.1 etc 13 vuotta sitten
reasons.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 vuotta sitten
relay.c 1db6eb6cb7 Merge remote-tracking branch 'origin/maint-0.2.2' 13 vuotta sitten
relay.h 27d1675d93 Move the decl for tor_gettimofday_cache_clear to the right header 13 vuotta sitten
rendclient.c c42bd529de Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
rendclient.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 vuotta sitten
rendcommon.c d3836b02cc change APIs slightly to make #1944 easier 13 vuotta sitten
rendcommon.h d3836b02cc change APIs slightly to make #1944 easier 13 vuotta sitten
rendmid.c 66039d9843 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 13 vuotta sitten
rendmid.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 vuotta sitten
rendservice.c aaa5737a2e Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
rendservice.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) 13 vuotta sitten
rephist.c 1db6eb6cb7 Merge remote-tracking branch 'origin/maint-0.2.2' 13 vuotta sitten
rephist.h d52a99dc77 Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
router.c ebf6786ab3 Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
router.h 8730884ebe Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
routerlist.c e91a8c5589 Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
routerlist.h 8730884ebe Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
routerparse.c 84f27eb051 Merge remote branch 'origin/maint-0.2.2' 13 vuotta sitten
routerparse.h 27d1675d93 Move the decl for tor_gettimofday_cache_clear to the right header 13 vuotta sitten
status.c 303c04109b Fix a couple of compile warnings on OS X 10.6 13 vuotta sitten
status.h ee95430d39 Implement more heartbeat message stuff. 13 vuotta sitten
tor_main.c f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 13 vuotta sitten