[Swan-commit] Changes to ref refs/heads/master

[Paul Wouters]

New commits:
commit 5f08b33f8e13da8e5a81a93298300d217a0304d6
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Jun 9 18:29:18 2014 -0400

    filter out bogus rightnext hop in status output when oriented.
    
    If we are oriented, we will not display the remote nexthop= setting,
    as currently that is calculated as if we were the other side, and it
    just ends up repeating our own nexthop setting.

commit b9525ac92df3f1cbd231656a1f592a2a99fb0489
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Jun 9 17:59:33 2014 -0400

    Improve timer.c logging. Rename EVENT_RETRANSMIT
    
    timer now logs more clearly when attempts are IKEv1 or IKEv2.
    timer now logs the number of the current attempt and the maximum.
    
    EVENT_RETRANSMIT is now called EVENT_v1_RETRANSMIT