Merge branch 'maint-0.2.8' into release-0.2.8

This commit is contained in:
Nick Mathewson 2016-12-19 08:07:37 -05:00
commit fe7a0c34b0
3 changed files with 3 additions and 3 deletions

View File

@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
dnl See LICENSE for licensing information dnl See LICENSE for licensing information
AC_PREREQ([2.63]) AC_PREREQ([2.63])
AC_INIT([tor],[0.2.8.11-dev]) AC_INIT([tor],[0.2.8.12])
AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])

View File

@ -8,7 +8,7 @@
!include "LogicLib.nsh" !include "LogicLib.nsh"
!include "FileFunc.nsh" !include "FileFunc.nsh"
!insertmacro GetParameters !insertmacro GetParameters
!define VERSION "0.2.8.11-dev" !define VERSION "0.2.8.12"
!define INSTALLER "tor-${VERSION}-win32.exe" !define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/" !define WEBSITE "https://www.torproject.org/"
!define LICENSE "LICENSE" !define LICENSE "LICENSE"

View File

@ -229,7 +229,7 @@
#define USING_TWOS_COMPLEMENT #define USING_TWOS_COMPLEMENT
/* Version number of package */ /* Version number of package */
#define VERSION "0.2.8.11-dev" #define VERSION "0.2.8.12"