summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-12-09 16:03:01 -0500
committerNick Mathewson <nickm@torproject.org>2019-12-09 16:03:01 -0500
commit17561434ebcf01eaa86737b2acfb65df8b57a8b5 (patch)
treee301b1ab3994f8b0ad0103db543df4843ecad979 /configure.ac
parent3248630fc81b24b22e337fab70d67c966b059356 (diff)
parent7174a80edd13d53f63be1558c6de341ec1296006 (diff)
downloadtor-17561434ebcf01eaa86737b2acfb65df8b57a8b5.tar.gz
tor-17561434ebcf01eaa86737b2acfb65df8b57a8b5.zip
Merge branch 'maint-0.4.1' into maint-0.4.2
"ours" to avoid version bump.
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions