Nick Mathewson
e34d963c44
Bump to 0.4.3.1-alpha-dev
2020-01-22 20:30:46 -05:00
Nick Mathewson
e144134294
Bump to 0.4.3.1-alpha
2020-01-21 12:33:05 -05:00
Nick Mathewson
efb301c86c
Document why dircache is not included in --list-modules
2020-01-16 07:48:17 -05:00
Nick Mathewson
888a0be0b9
Define a "dircache" module.
...
For now, this module is enabled whenever the relay module is
enabled, and disabled whenever the relay module is disabled. Though
they are logically separate, the use cases for running one without
the other are rare enough that we don't really want to support
compiling them independently.
2020-01-16 07:48:17 -05:00
Nick Mathewson
b7d18f8610
bump to 0.4.2.5-dev
2019-12-09 16:03:31 -05:00
Nick Mathewson
7174a80edd
bump to 0.4.1.7-dev
2019-12-09 16:02:36 -05:00
Nick Mathewson
0c4f0ec977
bump to 0.3.5.9-dev
2019-12-09 16:01:11 -05:00
Nick Mathewson
0a33522b62
Bump to 0.4.2.5
2019-12-05 13:32:30 -05:00
Nick Mathewson
8933c7908d
bump version to 0.4.1.7
2019-12-05 13:31:46 -05:00
Nick Mathewson
c53567c36f
Bump version to 0.3.5.9
2019-12-05 13:29:49 -05:00
Nick Mathewson
031f204a10
configure: reject Python 2.
...
Python 2 will be end-of-life as of 1 Jan 2020, so we can finally
stop supporting it. As a first step, we should make our configure
script stop accepting python 2 as something acceptable to run our
tests with.
Closes ticket 32608.
2019-11-25 13:01:04 -05:00
Nick Mathewson
6d81ca845c
bump version to 0.4.2.4-rc-dev
2019-11-15 08:06:09 -05:00
Nick Mathewson
70755eca00
Bump version to 0.4.2.4-rc.
2019-11-12 16:39:37 -05:00
Nick Mathewson
2b3dc3384c
Merge branch 'ticket32385'
2019-11-11 10:38:10 -05:00
Nick Mathewson
b1083584c7
Clarify that "missing-doc-warnings" makes doxygen warnings nonfatal
2019-11-11 10:38:04 -05:00
Nick Mathewson
059a5795d3
Merge branch 'maint-0.4.2'
2019-11-06 08:57:21 -05:00
teor
bf5b17d8bb
configure: Fix variable name typos
...
The "if-present" clause of AC_ARG_ENABLE() sets enable_{lzma,zstd},
so we don't need to set it. The "if-not-present" clause needs to set
enable_{lzma,zstd}, rather than just {lzma,zstd}.
The rest of the script only ever checks for enable_{lzma,zstd} = no,
so these changes do not actually change the behaviour of configure.
Fixes bug 32401.
2019-11-06 14:08:07 +10:00
Nick Mathewson
d3e547b2bd
Re-think our doxygen warnings wrt missing docs and fatalness.
...
Up till now, we have warned about all missing documentation, which
meant that we could never make doxygen warnings fatal. This has led
to our doxygen output getting full of errors several times in the
past.
This commit changes our approach to doxygen warnings: missing
documentation warnings are only on when the user asks for them with
--enable-missing-doc-warnings. When that option is not present,
doxygen respects the --enable-fatal-warnings flag.
Closes ticket 32385.
2019-11-05 12:24:02 -05:00
Nick Mathewson
fa860b6b17
Revert "doxygen: Use @SRCDIR@ instead of @top_srcdir@."
...
This reverts commit 4c2c98900b
.
2019-11-05 08:49:48 -05:00
Nick Mathewson
4c2c98900b
doxygen: Use @SRCDIR@ instead of @top_srcdir@.
...
Our @top_srcdir@ directory can contain "..", which confuses doxygen
when it tries to make references to directories. Using
@abs_top_srcdir@ has the same problem. Instead, we should use our
@SRCDIR@ configuration variable, which is canonicalized.
2019-11-05 08:37:22 -05:00
teor
804d7c9bfc
configure: Remove a check that will always fail
...
And update the changes file to be more specific.
Part of 32191.
2019-11-05 15:48:01 +10:00
Hans-Christoph Steiner
2a349006b9
force pkg-config to only use --prefix when cross-compiling
...
The current pkg-config setup has no sense of whether it is cross-compiling,
so it will detect things on the build system that are not present or are
wrong for the host system. This forces the cross-compiling build to only
look for pkg-config .pc files in --prefix.
A version of this has been the setup for many years with the Android builds.
Fixes #32191
Signed-off-by: Hans-Christoph Steiner <hans@eds.org>
2019-11-05 15:45:25 +10:00
Nick Mathewson
570d1367ea
bump to 0.4.2.3-alpha-dev
2019-10-24 15:55:22 -04:00
David Goulet
cf5f52d694
configure: Add --disable-module-relay to summary
...
Closes #32266
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-24 09:08:36 -04:00
Nick Mathewson
76939cf293
Bump to 0.4.2.3-alpha
2019-10-23 20:25:34 -04:00
teor
fdf47e0f0b
configure: Make --disable-module-relay imply --disable-module-dirauth
...
Part of 32123.
2019-10-20 17:52:38 +10:00
teor
2e2e1ed765
configure: Add a relay module, with --disable-module-relay
...
The Makefile and C defines don't actually do anything yet.
Part of 32123.
2019-10-20 17:52:38 +10:00
Nick Mathewson
37320bce06
Merge branch 'maint-0.4.2'
2019-10-18 12:42:56 -04:00
teor
ac71ad662c
configure: Stop failing when jemalloc is requested, but tcmalloc is not found
...
Fixes bug 32124; bugfix on 0.3.5.1-alpha.
2019-10-18 17:18:52 +10:00
teor
4442eef0b3
configure: Interpret --with-tcmalloc=no correctly
...
Fixes bug 32124; bugfix on 0.2.0.20-rc.
2019-10-18 17:16:32 +10:00
teor
f59c4a0940
configure: Interpret --disable-module-dirauth=no correctly
...
Fixes bug 32134; bugfix on 0.3.4.1-alpha.
2019-10-18 17:15:34 +10:00
teor
5ff99901d2
configure: Clarify the description of --disable-module-dirauth
...
Part of 32123.
2019-10-18 16:59:57 +10:00
Nick Mathewson
0081d6c112
Merge branch 'ticket31373_042_01_squashed'
2019-10-17 10:09:16 -04:00
David Goulet
7fcf999c63
Print summary at the end of the configure script
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-17 10:08:34 -04:00
Nick Mathewson
61fe3f448c
Bump master to 0.4.3.0-alpha-dev.
2019-10-11 17:15:04 -04:00
Nick Mathewson
52194c8681
Merge remote-tracking branch 'tor-github/pr/1390'
2019-10-07 10:13:32 -04:00
Nick Mathewson
5fb5019a94
bump to 0.4.2.2-alpha-dev
2019-10-07 09:32:26 -04:00
Nick Mathewson
065e467e7c
bump to 0.4.2.2-alpha
2019-10-03 12:07:50 -04:00
teor
8c4c58cc8d
configure: List the env vars needed if pkg-config doesn't work
...
Part of 31922.
2019-10-03 16:53:12 +10:00
teor
80bcd66213
configure: Fix a typo in the systemd version message
2019-10-03 16:32:30 +10:00
teor
f0993d3831
configure: Give a more useful message when pkg-config fails
...
When pkg-config is not installed, or a library that depends on
pkg-config is not found, tell the user what to do to fix the
problem.
Fixes bug 31922; bugfix on 0.3.1.1-alpha.
2019-10-03 16:31:20 +10:00
teor
c7c849bba8
configure: Explain --disable-module-dirauth better
...
Explain what the optional Directory Authority module is, and what
happens when it is disabled.
Fixes bug 31825; bugfix on 0.3.4.1-alpha.
2019-09-24 11:29:22 +10:00
Nick Mathewson
6f3f93d86c
bump to 0.4.1.6-dev
2019-09-19 08:52:15 -04:00
Nick Mathewson
a3342b382a
Bump version to 0.4.1.6
2019-09-17 19:11:56 -04:00
Nick Mathewson
75d3c08219
bump to 0.4.2.1-alpha-dev
2019-09-17 11:36:43 -04:00
Nick Mathewson
a28a682a1f
bump version to 0.4.2.1-alpha
2019-09-16 16:24:24 -04:00
Nick Mathewson
3b2a732073
bump to 0.4.1.5-dev
2019-08-20 11:15:45 -04:00
Sebastian Hahn
360a29e282
Rust: Update version requirements and CI
...
The #[global_allocator] attribute is not available in versions prior to
1.28.0, the default-linker-libraries feature requires rust 1.31.0.
Adapt the CI to prevent accidental increases in Rust version by testing
against 1.31.0, beta and nightly.
2019-08-20 07:16:46 +02:00
Nick Mathewson
ab92881d9a
Update version to 0.4.1.5
2019-08-19 11:35:48 -04:00
Nick Mathewson
d8264ab62b
bump to 0.4.1.4-rc-dev
2019-07-25 21:51:53 -04:00
Nick Mathewson
b2a6b52825
Bump version to 0.4.1.4-rc
2019-07-25 09:00:53 -04:00
Nick Mathewson
e4f66bf7ff
bump to 0.4.1.3-alpha-dev
2019-06-25 11:55:53 -04:00
Nick Mathewson
aab5f42ae0
bump to 0.4.1.3-alpha
2019-06-24 09:32:46 -04:00
rl1987
66a15013fa
Allow excluding documentation from the build
2019-06-16 20:21:30 +03:00
George Kadianakis
a7986755ee
Merge branch 'tor-github/pr/1060'
2019-06-11 14:12:22 +03:00
Nick Mathewson
df8e2bbc0f
Merge remote-tracking branch 'tor-github/pr/1038'
2019-06-10 09:38:40 -04:00
Nick Mathewson
adc7b50eae
Bump master to 0.4.2.0-alpha-dev
2019-06-10 08:47:33 -04:00
Nick Mathewson
ecc5feff38
bump to 0.4.1.2-alpha-dev
2019-06-06 08:28:34 -04:00
Nick Mathewson
d1b02456c1
Bump to 0.4.1.2-alpha
2019-06-05 09:25:21 -04:00
Nick Mathewson
66eae4afff
Check whether gcc-hardening is runnable, and log an error if not
...
Closes ticket 27530.
2019-05-29 16:08:33 -04:00
Nick Mathewson
ebe39dcb92
Now this repository is full of 0.4.1.1-alpha-dev
2019-05-22 18:07:29 -04:00
Nick Mathewson
3a7ed8bc5f
Bump to 0.4.1.1-alpha
2019-05-22 11:56:02 -04:00
rl1987
fb91e1c6ef
Remove torctl.in from contrib/dist
2019-05-21 14:56:53 +03:00
rl1987
6d347fe329
Remove obsolete OpenSUSE initscript
2019-04-27 10:33:33 +03:00
rl1987
0d88b808e9
Remove contrib/dist/tor.sh.in
2019-04-17 13:15:02 +03:00
teor
613c5ff357
Merge remote-tracking branch 'tor-github/pr/724'
2019-03-26 19:31:17 +10:00
rl1987
13b28063f9
Compile time check for being able to fit {unsigned} int inside void pointer
2019-03-22 12:57:58 +02:00
Nick Mathewson
cab93930de
Merge branch 'pr_722_squashed'
2019-03-13 10:37:37 -04:00
George Kadianakis
8b64ff7a3f
Silence unneeded clang warns that triggered in prob distr tests.
...
See https://trac.torproject.org/projects/tor/ticket/29528#comment:3
and https://bugs.llvm.org/show_bug.cgi?id=19535
2019-03-13 10:36:26 -04:00
David Goulet
b402a0887f
Merge branch 'tor-github/pr/655'
2019-02-26 11:30:44 -05:00
Nick Mathewson
955ca72f95
Bump to 0.3.5.8-dev
2019-02-21 13:24:42 -05:00
Nick Mathewson
c663716b67
Bump to 0.3.5.8
2019-02-21 09:51:29 -05:00
Nick Mathewson
9a158a45b1
Bump to 0.4.1.0-alpha-dev
2019-02-19 09:29:43 -05:00
Nick Mathewson
8ca808f81d
Code for anonymous mappings via mmap() or CreateFileMapping().
...
Using an anonymous mmap() is a good way to get pages that we can set
kernel-level flags on, like minherit() or madvise() or mlock().
We're going to use that so that we can make uninheritable locked
pages to store PRNG data.
2019-02-06 22:03:30 -05:00
Nick Mathewson
67f275f8da
Bump to 0.4.0.1-alpha-dev
2019-01-18 10:08:57 -05:00
Nick Mathewson
c393171403
Use openssl's version of sha3 when available.
...
Part of 28837.
2019-01-17 12:43:20 -05:00
Nick Mathewson
2f683465d4
Bump copyright date to 2019
2019-01-16 12:33:22 -05:00
Nick Mathewson
efe55b8898
Bump copyright date to 2019.
2019-01-16 12:32:32 -05:00
Nick Mathewson
dd524c6335
Bump to 0.4.0.1-alpha
2019-01-16 08:32:09 -05:00
Nick Mathewson
44edfa7adc
Update to 0.3.5.7-dev
2019-01-07 21:18:25 -05:00
Nick Mathewson
52b508735f
Bump version to 0.3.5.7
2019-01-07 10:23:21 -05:00
Nick Mathewson
9190f43b1a
Merge branch 'maint-0.3.5'
2018-12-21 11:30:58 -05:00
Nick Mathewson
97c9ced70a
Try @warning_flags to avoid bloating verbose make logs
...
We now accumulate warning flags in a separate variable,
"TOR_WARNING_FLAGS", and write it to a "warning_flags" file. Then
we test whether the compiler will accept "@warning_flags": if so, we
put "@warning_flags" in the CFLAGS; if not, we copy the contents of
"$TOR_WARNING_FLAGS" into the CFLAGS.
Closes ticket 28924.
2018-12-21 10:00:23 -05:00
Nick Mathewson
bf71dce01a
Bump version to 0.3.5.6-rc-dev
2018-12-18 13:33:49 -05:00
Nick Mathewson
d8f41c2870
Bump to 0.3.5.6-rc
2018-12-18 08:04:04 -05:00
Nick Mathewson
b16d6453ad
Rewrite updateVersions script in Python, add datestamp functionality.
...
This updateVersions.pl script was one of the only essential perl
scripts left in out maint system, and was the only one that used
autoconf to fill in the script.
This script adds a feature to define an APPROX_RELEASE_DATE macro
that is updated when the version changes. We'll use this to
implement prop297, so that we have an accurate view of when a
release date happens.
2018-11-24 20:44:37 -05:00
Nick Mathewson
a4f2075170
Merge remote-tracking branch 'isis/bug25341' into ticket25341_merged_v2
2018-11-19 09:22:30 -05:00
Nick Mathewson
942c2da48e
Bump to 0.3.5.5-alpha-dev
2018-11-16 11:32:04 -05:00
Nick Mathewson
c9906cc3f6
Bump to 0.3.5.5-alpha
2018-11-16 08:28:45 -05:00
Nick Mathewson
5d73f87ced
Merge branch 'maint-0.3.5'
2018-11-09 10:49:48 -05:00
Nick Mathewson
2ac2d0a426
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-11-09 10:49:47 -05:00
Nick Mathewson
591a189fa4
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-09 10:49:47 -05:00
Nick Mathewson
c06b7f090c
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-11-09 10:49:47 -05:00
Nick Mathewson
1ba1a1ceca
Always declare groups when building with openssl 1.1.1 APIs
...
Failing to do on clients was causing TLS 1.3 negotiation to fail.
Fixes bug 28245; bugfix on 0.2.9.15, when we added TLS 1.3 support.
2018-11-09 10:10:25 -05:00
Nick Mathewson
6560346a45
Bump version to 0.3.5.4-alpha-dev.
2018-11-08 09:00:59 -05:00
Nick Mathewson
f229c4e66a
Bump to 0.3.5.4-alpha
2018-11-07 14:40:26 -05:00
Nick Mathewson
9e48d9a920
Change version on master to 0.4.0.0-alpha-dev.
2018-11-07 10:54:03 -05:00
Nick Mathewson
5acf6f8717
Bump to 0.3.4.9-dev
2018-11-02 13:01:32 -04:00
Nick Mathewson
d8d4fe83d0
Bump to 0.3.4.9
2018-11-02 09:08:45 -04:00
Nick Mathewson
30d853a906
Merge remote-tracking branch 'tor-github/pr/425'
2018-10-30 09:16:55 -04:00
Nick Mathewson
c19bb4d62e
Merge branch 'maint-0.3.5'
2018-10-30 08:45:49 -04:00
Nick Mathewson
262b0fe7a0
Merge remote-tracking branch 'tor-github/pr/381' into maint-0.3.5
2018-10-30 08:39:57 -04:00
Alex Crichton
8285784966
Only pass -C default-linker-libraries
with sanitizers
...
This'll help retain test compatibility until 1.31.0 is released!
2018-10-29 10:00:23 -07:00
rl1987
92f0e04f8d
Check if libevent comes with evdns_base_get_nameserver_addr()
2018-10-20 20:34:08 +03:00
Nick Mathewson
fd2e0ac1c3
Bump to 0.3.6.0-alpha-dev.
2018-10-17 14:46:38 -04:00
Nick Mathewson
389bae0e8b
Bump to 0.3.5.3-alpha-dev
2018-10-17 14:46:00 -04:00
Nick Mathewson
d70ca3554e
Bump to 0.3.5.3-alpha
2018-10-17 09:26:32 -04:00
Alex Crichton
6ebb2c46d5
Remove the link_rust.sh.in
script
...
This is no longer necessary with upstream rust-lang/rust changes as well
as some local tweaks. Namely:
* The `-fsanitize=address`-style options are now passed via `-C
link-args` through `RUSTFLAGS`. This obviates the need for the shell
script.
* The `-C default-linker-libraries`, disabling `-nodefaultlibs`, is
passed through `RUSTFLAGS`, which is necessary to ensure that
`-fsanitize=address` links correctly.
* The `-C linker` option is passed to ensure we're using the same C
compiler as normal C code, although it has a bit of hackery to only
get the `gcc` out of `gcc -std=c99`
2018-10-01 22:50:08 -07:00
Nick Mathewson
55122bfe04
Bump to 0.3.5.2-alpha-dev
2018-09-21 09:11:33 -04:00
Nick Mathewson
1a85ac8c2d
Bump to 0.3.5.2-alpha
2018-09-20 16:36:07 -04:00
Nick Mathewson
7ca0f66b82
Bump to 0.3.5.1-alpha-dev
2018-09-18 07:52:27 -04:00
Nick Mathewson
307275a5e4
Bump to 0.3.5.1-alpha
2018-09-17 09:12:42 -04:00
Nick Mathewson
fae7f96e7b
Explain PIE/PIC rationale for 23846.
2018-09-13 14:53:20 -04:00
Nick Mathewson
0aec613a78
Add an --enable-pic option for people who hack Tor into libraries
...
Closes ticket 23846
2018-09-12 10:10:29 -04:00
Nick Mathewson
96601a6805
Bump to 0.3.4.8-dev
2018-09-10 09:42:40 -04:00
Nick Mathewson
05f5f65006
Bump to 0.3.3.10-dev.
2018-09-10 09:42:12 -04:00
Nick Mathewson
b203dedaf5
Bump to 0.2.9.17-dev
2018-09-10 09:41:22 -04:00
Nick Mathewson
43e400f340
Bump to 0.3.3.10
2018-09-07 15:11:18 -04:00
Nick Mathewson
da29074fc4
Bump to 0.2.9.17
2018-09-07 15:10:49 -04:00
Nick Mathewson
fa38bbb700
Bump to 0.3.4.8
2018-09-07 09:49:29 -04:00
Nick Mathewson
732ea9120c
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-07 09:15:56 -04:00
Nick Mathewson
8849b2ca3c
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-07 09:15:56 -04:00
Nick Mathewson
ee6d8bcf71
Merge branch 'maint-0.3.4'
2018-09-07 09:15:56 -04:00
Nick Mathewson
0366ae224c
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-07 09:15:52 -04:00
Nick Mathewson
2ec88a2a6d
Tell openssl to build its TLS contexts with security level 1
...
Fixes bug 27344, where we'd break compatibility with old tors by
rejecting RSA1024 and DH1024.
2018-09-07 09:15:06 -04:00
Nick Mathewson
0db5c54957
Merge branch 'nss_squashed' into nss_merge
2018-09-04 20:21:07 -04:00
Nick Mathewson
3b10108a2a
Fix documentation of ENABLE_NSS
2018-09-04 14:52:35 -04:00
Nick Mathewson
48632455a5
Merge branch 'bug26367_035_01'
2018-08-28 16:02:04 -04:00
David Goulet
4976eca826
hs: Render obsolete Tor2web
...
Remove support for Tor2web in the code and build system. At this commit, tor
doesn't have Tor2web support anymore.
Ref: https://lists.torproject.org/pipermail/tor-dev/2018-July/013295.html
Close #26367
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-08-28 16:01:57 -04:00
Nick Mathewson
4c1c818ffa
Update to 0.3.4.7-rc-dev
2018-08-24 16:49:56 -04:00
Nick Mathewson
4748fd23da
Bump to 0.3.4.7-rc
2018-08-24 09:13:20 -04:00
Nick Mathewson
6a88d8f6b4
When enabling NSS, disable OpenSSL.
...
We used to link both libraries at once, but now that I'm working on
TLS, there's nothing left to keep OpenSSL around for when NSS is
enabled.
Note that this patch causes a couple of places that still assumed
OpenSSL to be disabled when NSS is enabled
- tor-gencert
- pbkdf2
2018-08-21 12:25:33 -04:00
Nick Mathewson
571cb2f662
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-15 12:20:57 -04:00
Nick Mathewson
0fc171a47b
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-15 12:20:57 -04:00
Nick Mathewson
34083f00ab
Merge branch 'maint-0.3.4'
2018-08-15 12:20:57 -04:00
Nick Mathewson
a26a2735b9
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-15 12:20:57 -04:00
Nick Mathewson
6c1d2549df
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-15 02:16:23 -04:00
Nick Mathewson
26f1167e71
Merge branch 'bug26779_033' into bug26779_035
2018-08-08 15:50:29 -04:00
Nick Mathewson
b66386865e
Detect broken stdatomic.h, and pretend that it isn't there at all
...
I hope that the debian clang maintainers will look at debian bug
903709 soon. But until they do, this should keep our users and our
CI happy on sid with clang.
Closes ticket 26779.
2018-08-08 15:49:39 -04:00
Nick Mathewson
7a570b8182
Don't search for -lpthread on Windows
...
If we're building for Windows, we want to use windows threads no
matter what, and we don't want to link a pthread library even if it
is present. Fixes bug 27081; bugfix on 1790dc6760
in 0.1.0.1-rc.
2018-08-08 09:56:51 -04:00
Nick Mathewson
de129e69ba
Update version to 0.3.4.6-rc-dev
2018-08-07 20:15:34 -04:00
Nick Mathewson
a8bab72c37
Bump to 0.3.4.6-rc
2018-08-06 08:28:56 -04:00
Nick Mathewson
f90c053377
Update AC_WARN->AC_MSG_WARN. #23878 .
2018-08-04 06:53:21 -04:00
Nick Mathewson
5597ddc360
Mark openbsd-malloc as deprecated
2018-08-03 07:38:47 -04:00
Nick Mathewson
bb1f294232
Merge branch 'with_malloc_squashed'
2018-08-03 07:35:23 -04:00
Nick Mathewson
abde9fb426
Add a --with-malloc option.
...
Based on a patch from Hello71 on ticket 20424.
This patch additionally fixes openbsd-malloc support, switches
our tcmalloc support to use pkgconfig, and tells the compiler to
omit system malloc implementations as appropriate.
squash! Add a --with-malloc option.
Edit changelog file to fix a typo and credit Alex Xu in preferred format.
2018-08-03 07:34:40 -04:00
Nick Mathewson
2a6c1585b0
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-03 07:33:45 -04:00
Nick Mathewson
4856a6e6c4
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-03 07:33:45 -04:00
Nick Mathewson
be8e56c231
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-03 07:33:45 -04:00
Nick Mathewson
ae157b79e7
Merge branch 'maint-0.3.4'
2018-08-03 07:33:45 -04:00