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