]> git.ipfire.org Git - thirdparty/tor.git/commit
projects / thirdparty / tor.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e895919 1a07348)
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Mon, 3 Jan 2011 16:51:17 +0000 (11:51 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 3 Jan 2011 16:51:17 +0000 (11:51 -0500)
commitf1de329e784e76dbb27cde148522a6c490e7cf63
tree3d3fea0781bfa37410a932e7d7345af25f845ea9tree | snapshot
parente895919b171029df4d38285b0be4483376b4ad25commit | diff
parent1a07348a50ec679c8b7bb1abb45e61a9ebcc69a9commit | diff
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

Conflicts:
src/common/test.h
src/or/test.c
60 files changed:
Makefile.am diff1 | diff2 | blob | history
contrib/polipo/README diff1 | diff2 | blob | history
src/common/address.c diff1 | diff2 | blob | history
src/common/address.h diff1 | diff2 | blob | history
src/common/aes.c diff1 | diff2 | blob | history
src/common/compat.c diff1 | diff2 | blob | history
src/common/compat.h diff1 | diff2 | blob | history
src/common/container.c diff1 | diff2 | blob | history
src/common/container.h diff1 | diff2 | blob | history
src/common/crypto.c diff1 | diff2 | blob | history
src/common/crypto.h diff1 | diff2 | blob | history
src/common/ht.h diff1 | diff2 | blob | history
src/common/log.c diff1 | diff2 | blob | history
src/common/memarea.c diff1 | diff2 | blob | history
src/common/mempool.c diff1 | diff2 | blob | history
src/common/torgzip.c diff1 | diff2 | blob | history
src/common/torint.h diff1 | diff2 | blob | history
src/common/torlog.h diff1 | diff2 | blob | history
src/common/tortls.c diff1 | diff2 | blob | history
src/common/tortls.h diff1 | diff2 | blob | history
src/common/util.c diff1 | diff2 | blob | history
src/common/util.h diff1 | diff2 | blob | history
src/or/buffers.c diff1 | diff2 | blob | history
src/or/circuitbuild.c diff1 | diff2 | blob | history
src/or/circuitlist.c diff1 | diff2 | blob | history
src/or/circuituse.c diff1 | diff2 | blob | history
src/or/command.c diff1 | diff2 | blob | history
src/or/config.c diff1 | diff2 | blob | history
src/or/connection.c diff1 | diff2 | blob | history
src/or/connection_edge.c diff1 | diff2 | blob | history
src/or/connection_or.c diff1 | diff2 | blob | history
src/or/control.c diff1 | diff2 | blob | history
src/or/cpuworker.c diff1 | diff2 | blob | history
src/or/directory.c diff1 | diff2 | blob | history
src/or/dirserv.c diff1 | diff2 | blob | history
src/or/dirvote.c diff1 | diff2 | blob | history
src/or/dns.c diff1 | diff2 | blob | history
src/or/dnsserv.c diff1 | diff2 | blob | history
src/or/geoip.c diff1 | diff2 | blob | history
src/or/hibernate.c diff1 | diff2 | blob | history
src/or/main.c diff1 | diff2 | blob | history
src/or/networkstatus.c diff1 | diff2 | blob | history
src/or/ntmain.c diff1 | diff2 | blob | history
src/or/onion.c diff1 | diff2 | blob | history
src/or/or.h diff1 | diff2 | blob | history
src/or/policies.c diff1 | diff2 | blob | history
src/or/reasons.c diff1 | diff2 | blob | history
src/or/relay.c diff1 | diff2 | blob | history
src/or/rendclient.c diff1 | diff2 | blob | history
src/or/rendcommon.c diff1 | diff2 | blob | history
src/or/rendmid.c diff1 | diff2 | blob | history
src/or/rendservice.c diff1 | diff2 | blob | history
src/or/rephist.c diff1 | diff2 | blob | history
src/or/router.c diff1 | diff2 | blob | history
src/or/routerlist.c diff1 | diff2 | blob | history
src/or/routerparse.c diff1 | diff2 | blob | history
src/or/tor_main.c diff1 | diff2 | blob | history
src/test/test_data.c diff1 | diff2 | blob | history
src/tools/tor-gencert.c diff1 | diff2 | blob | history
src/tools/tor-resolve.c diff1 | diff2 | blob | history
Mirror of https://git.torproject.org/tor.git