tor

commit 71ddfbaadd9802ae935208191fbe2605d9146491
parent 3dd94a7ea7e85307822885306cbd7096b56442df
Author: Nick Mathewson <nickm@torproject.org>
Date:   Sat, 16 Jun 2018 12:43:28 -0400

Merge remote-tracking branch 'isis/bug26267' into maint-0.3.4

Diffstat:
M
configure.ac
 | 
2
+-
M
contrib/win32build/tor-mingw.nsi.in
 | 
2
+-
M
src/rust/crypto/lib.rs
 | 
1
+
M
src/win32/orconfig.h
 | 
2
+-

4 files changed, 4 insertions(+), 3 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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"