Nick Mathewson 66039d9843 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=13) %!d(string=hai) anos
..
Makefile.am ddf5020ea8 Fix 'make distcheck' %!s(int64=14) %!d(string=hai) anos
buffers.c f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=13) %!d(string=hai) anos
buffers.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) %!s(int64=13) %!d(string=hai) anos
circuitbuild.c 66039d9843 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=13) %!d(string=hai) anos
circuitbuild.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) %!s(int64=13) %!d(string=hai) anos
circuitlist.c f1de329e78 Merge remote branch 'origin/maint-0.2.1' into 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 f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=13) %!d(string=hai) anos
circuituse.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) %!s(int64=13) %!d(string=hai) anos
command.c 66039d9843 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!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 f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=13) %!d(string=hai) anos
config.h 30b3475e6d Bump copyright statements to 2011 (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 f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=13) %!d(string=hai) anos
connection.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) %!s(int64=13) %!d(string=hai) anos
connection_edge.c f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=13) %!d(string=hai) anos
connection_edge.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) %!s(int64=13) %!d(string=hai) anos
connection_or.c f1de329e78 Merge remote branch 'origin/maint-0.2.1' into 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 f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=13) %!d(string=hai) anos
control.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) %!s(int64=13) %!d(string=hai) anos
cpuworker.c f1de329e78 Merge remote branch 'origin/maint-0.2.1' into 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 f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=13) %!d(string=hai) anos
directory.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) %!s(int64=13) %!d(string=hai) anos
dirserv.c f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=13) %!d(string=hai) anos
dirserv.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) %!s(int64=13) %!d(string=hai) anos
dirvote.c f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=13) %!d(string=hai) anos
dirvote.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) %!s(int64=13) %!d(string=hai) anos
dns.c f1de329e78 Merge remote branch 'origin/maint-0.2.1' into 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 f1de329e78 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 d073d7d4eb Consistency issues in load_windows_system_library patch. Thanks Sebastian %!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 f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=13) %!d(string=hai) anos
geoip.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) %!s(int64=13) %!d(string=hai) anos
hibernate.c f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!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 f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=13) %!d(string=hai) anos
main.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) %!s(int64=13) %!d(string=hai) anos
microdesc.c 30b3475e6d Bump copyright statements to 2011 (0.2.2) %!s(int64=13) %!d(string=hai) anos
microdesc.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) %!s(int64=13) %!d(string=hai) anos
networkstatus.c f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=13) %!d(string=hai) anos
networkstatus.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) %!s(int64=13) %!d(string=hai) anos
ntmain.c f1de329e78 Merge remote branch 'origin/maint-0.2.1' into 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 66039d9843 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!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 f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=13) %!d(string=hai) anos
policies.c f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=13) %!d(string=hai) anos
policies.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) %!s(int64=13) %!d(string=hai) anos
reasons.c f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!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 f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=13) %!d(string=hai) anos
relay.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) %!s(int64=13) %!d(string=hai) anos
rendclient.c f1de329e78 Merge remote branch 'origin/maint-0.2.1' into 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 f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=13) %!d(string=hai) anos
rendcommon.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) %!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 f1de329e78 Merge remote branch 'origin/maint-0.2.1' into 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 f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=13) %!d(string=hai) anos
rephist.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) %!s(int64=13) %!d(string=hai) anos
router.c f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=13) %!d(string=hai) anos
router.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) %!s(int64=13) %!d(string=hai) anos
routerlist.c f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=13) %!d(string=hai) anos
routerlist.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) %!s(int64=13) %!d(string=hai) anos
routerparse.c f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=13) %!d(string=hai) anos
routerparse.h 30b3475e6d Bump copyright statements to 2011 (0.2.2) %!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