diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-16 12:43:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-16 12:43:28 -0400 |
| commit | 71ddfbaadd9802ae935208191fbe2605d9146491 (patch) | |
| tree | 9dd21ff026da512a2f0f803e45da1f3952b99b4d | |
| parent | 3dd94a7ea7e85307822885306cbd7096b56442df (diff) | |
| parent | ac5b1428ea9d0a4c59e9c9c11a88019ebae6abf0 (diff) | |
| download | tor-71ddfbaadd9802ae935208191fbe2605d9146491.tar.gz tor-71ddfbaadd9802ae935208191fbe2605d9146491.zip | |
Merge remote-tracking branch 'isis/bug26267' into maint-0.3.4
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | contrib/win32build/tor-mingw.nsi.in | 2 | ||||
| -rw-r--r-- | src/rust/crypto/lib.rs | 1 | ||||
| -rw-r--r-- | src/win32/orconfig.h | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 5269d9c42e..48ca5bae14 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.4.2-alpha-dev]) +AC_INIT([tor],[0.3.5.0-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 8181c94241..c9822790bb 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.4.2-alpha-dev" +!define VERSION "0.3.5.0-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/rust/crypto/lib.rs b/src/rust/crypto/lib.rs index e7e3b22e03..b349664dbe 100644 --- a/src/rust/crypto/lib.rs +++ b/src/rust/crypto/lib.rs @@ -34,4 +34,5 @@ extern crate libc; extern crate external; pub mod digests; // Unfortunately named "digests" plural to avoid name conflict with the digest crate +pub mod rand; diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index a201a76ac6..65a905debe 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.4.2-alpha-dev" +#define VERSION "0.3.5.0-alpha-dev" |