summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-07-09 13:15:23 -0400
committerNick Mathewson <nickm@torproject.org>2020-07-09 13:15:23 -0400
commiteb6fc9f9bd89a02088af1cfa6fb4e39fe15ea9fc (patch)
tree918008e6eb72c97c4e9e226202862303598de111 /configure.ac
parent3efd604743a9468542e75971cff4dccc5fa894c6 (diff)
parent3517d203227284d41ead62d65e90b38b9f11186e (diff)
downloadtor-eb6fc9f9bd89a02088af1cfa6fb4e39fe15ea9fc.tar.gz
tor-eb6fc9f9bd89a02088af1cfa6fb4e39fe15ea9fc.zip
Merge branch 'maint-0.4.3' into maint-0.4.4
`-s ours` to avoid version bump.
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions