chiark / gitweb /
Merge branch '1.0.0pre19.x' master
authorMark Wooding <mdw@distorted.org.uk>
Mon, 25 May 2020 15:33:19 +0000 (16:33 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 25 May 2020 15:33:19 +0000 (16:33 +0100)
commitab6f1b0d12478b8fe266e3dacc3de7121df29066
tree6ac7742a0b9f95e8533c3d15ca46e9ba1ca65a95
parent136f3f44e25317d5423b4bc0b075b297e6d00c93
parent151e9bb8f89da9dcf731681e4d645cc94d1b6a3e
Merge branch '1.0.0pre19.x'

* 1.0.0pre19.x:
  svc/connect.in: Squash newlines to spaces in `info' output.
  server/admin.c: Fix `=' vs `==' error in assertion.
  svc/tripe-ifup.in: Don't set remote IPv6 address until interface is up.
server/admin.c
svc/connect.in
svc/tripe-ifup.in