mirror/tor
0
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 04:12:13 +02:00
Code

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

Browse Source
This commit is contained in:
Nick Mathewson 2018-06-16 12:43:28 -04:00
commit 71ddfbaadd
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -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])

2
contrib/win32build/tor-mingw.nsi.in
View File

@ -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"

1
src/rust/crypto/lib.rs
View File

@ -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;

2
src/win32/orconfig.h
View File

@ -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"