[hipl-commit] [tiny] Rev 3542: Synchronized to trunk revision 3693.

  • From: Tim Just <tim.just@xxxxxxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Mon, 22 Feb 2010 12:47:26 +0200

Committer: Tim Just <tim.just@xxxxxxxxxxxxxx>
Date: Mon Feb 22 11:46:43 2010 +0100
Revision: 3542 [merge]
Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: tiny

Log:
  Synchronized to trunk revision 3693.

Modified:
  M  autogen.sh
  M  check_header_verbosity.sh*
  M  configure.ac
  M  debian/cron.d.ex
  M  debian/emacsen-startup.ex
  M  debian/init.d.ex
  M  debian/manpage.sgml.ex
  M  debian/manpage.xml.ex
  M  doc/HACKING
  M  doc/HOWTO.xml
  M  doc/Makefile
  M  doc/TODO
  M  doc/crypto.txt
  M  doc/design_choices.tex
  M  doc/drafts/draft-ietf-hip-arch-02.txt
  M  doc/drafts/draft-ietf-hip-base-00.txt
  M  doc/drafts/draft-ietf-hip-base-01.txt
  M  doc/drafts/draft-ietf-hip-mm-01.txt
  M  doc/drafts/draft-moskowitz-hip-05.txt
  M  doc/drafts/draft-moskowitz-hip-10-pre4.txt
  M  doc/drafts/draft-moskowitz-hip-impl-01.txt
  M  doc/drafts/draft-nikander-esp-beet-mode-03.txt
  M  doc/drafts/draft-nikander-hip-mm-01.txt
  M  doc/drafts/draft-nikander-hip-mm-02.txt
  M  doc/hip-php-test-site.php
  M  doc/openwrt/FoneraHack/dropbear.html
  M  doc/openwrt/FoneraHack/enableSSH.html
  M  doc/openwrt/index.html
  M  doc/reg_lifetimes.txt
  M  doc/userspace.txt
  M  hipd/pfkeyapi.c
  M  lib/android/icmp6.h
  M  lib/android/libhipandroid.c
  M  lib/android/libipq.c
  M  lib/android/regex.c
  M  lib/android/regex.h
  M  lib/conf/hipconf.c
  M  lib/core/esp_prot_common.c
  M  lib/core/hashchain.c
  M  lib/core/hashchain_store.c
  M  lib/core/hashtree.c
  M  lib/core/misc.c
  M  lib/ipsec/ipsec_set_policy.3
  M  lib/ipsec/ipsec_strerror.3
  M  lib/ipsec/ipsec_strerror.c
  M  lib/ipsec/pfkey.c
  M  lib/ipsec/policy_parse.c
  M  lib/ipsec/policy_parse.y
  M  lib/ipsec/policy_token.l
  M  lib/performance/performance.c
  M  patches/bind/named.conf
  M  patches/kernel/2.6.18.0/README
  M  patches/misc/README.SPAMASS.HIPL
  M  patches/opendht/bamboo_diff_FROM_ipv4-20060303_TO_ipv6-20080612.diff
  M  patches/opendht/how-to-steps
  M  patches/openwrt/2.6.25/README
  M  patches/tcpdump/README
  M  patches/tcpdump/README.outdated
  M  patches/wireshark/ethereal-0.10.14-hip.patch
  M  patches/wireshark/ethereal-0.10.14-i3.patch
  M  patches/wireshark/ethereal-0.99.0-hip-base05.patch
  M  patches/wireshark/wireshark-0.99.5-hip-base05-fixed-locator.patch
  M  test/auth_eval.sh
  M  test/hc_performance.c
  M  test/iperf_handovers.sh*
  M  test/maintainer/do-all
  M  test/maintainer/fix-archive-perms*
  M  test/maintainer/gen-archzoom-cache
  M  test/maintainer/scptar
  M  test/maintainer/sync-all*
  M  test/maintainer/tla-update-cachedrevs
  M  test/maintainer/update-html-howto
  M  test/packaging/armel/DEBIAN-FW/changelog
  M  test/packaging/armel/DEBIAN-FW/control
  M  test/packaging/armel/DEBIAN-FW/control-src
  M  test/packaging/armel/DEBIAN-FW/postinst
  M  test/packaging/armel/DEBIAN-FW/postrm
  M  test/packaging/armel/DEBIAN-FW/preinst
  M  test/packaging/armel/DEBIAN-FW/prerm
  M  test/packaging/armel/DEBIAN-dnsproxy/changelog
  M  test/packaging/armel/DEBIAN-dnsproxy/postrm
  M  test/packaging/armel/DEBIAN-dnsproxy/prerm
  M  test/packaging/armel/DEBIAN-gconf/changelog
  M  test/packaging/armel/DEBIAN/changelog
  M  test/packaging/armel/DEBIAN/postinst
  M  test/packaging/armel/DEBIAN/postrm
  M  test/packaging/armel/DEBIAN/preinst
  M  test/packaging/armel/DEBIAN/prerm
  M  test/packaging/create-deb.sh*
  M  test/packaging/create-package.sh*
  M  test/packaging/debbuild*
  M  test/packaging/debian-init.d-dnsproxy*
  M  test/packaging/debian-init.d-hipd*
  M  test/packaging/debian-init.d-hipfw*
  M  test/packaging/hipl-deb.spec
  M  test/packaging/hipl-rpm.spec
  M  test/packaging/rh-init.d-dnsproxy*
  M  test/packaging/rh-init.d-hipd*
  M  test/packaging/rh-init.d-hipfw*
  M  test/performance/README
  M  test/performance/clock_test.awk*
  M  test/performance/cookiesolver.c
  M  test/performance/eval_me.sh
  M  test/performance/firewall.init
  M  test/performance/firewall.rules
  M  test/performance/genstats.awk*
  M  test/performance/keygenstats.sh
  M  test/performance/measure_me.sh
  M  test/performance/memo*
  M  test/performance/parser.awk*
  M  test/performance/plot-no_midfw
  M  test/performance/plot-with_pcfw
  M  test/performance/stats.pl*
  M  test/performance/switch-ip*
  M  test/performance/visualize-daemon.sh*
  M  tools/DNS/Base.py
  M  tools/DNS/Lib.py
  M  tools/DNS/Type.py
  M  tools/DNS/pyip6.py
  M  tools/esp_prot_config.cfg
  M  tools/hosts.py*
  M  tools/nsupdate.pl*
  M  tools/pyip6.py*

Merge from following parent revisions and branches:
  - tiny          (parent-id: 
tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)    
  - trunk         (parent-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)    

Other related posts:

  • » [hipl-commit] [tiny] Rev 3542: Synchronized to trunk revision 3693. - Tim Just