Commit e0b77cd3 authored by Nick Mathewson's avatar Nick Mathewson 🐚
Browse files

Merge branch 'maint-0.2.6' into release-0.2.6

parents eea90546 77c671b7

configure.ac

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson 
dnl Copyright (c) 2007-2015, The Tor Project, Inc.

dnl See LICENSE for licensing information



AC_INIT([tor],[0.2.6.4-rc-dev])

AC_INIT([tor],[0.2.6.5-rc])

AC_CONFIG_SRCDIR([src/or/main.c])

AC_CONFIG_MACRO_DIR([m4])

AM_INIT_AUTOMAKE

contrib/win32build/tor-mingw.nsi.in

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
!include "LogicLib.nsh"

!include "FileFunc.nsh"

!insertmacro GetParameters

!define VERSION "0.2.6.4-rc-dev"

!define VERSION "0.2.6.5-rc"

!define INSTALLER "tor-${VERSION}-win32.exe"

!define WEBSITE "https://www.torproject.org/"

!define LICENSE "LICENSE"

src/win32/orconfig.h

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ 
#define USING_TWOS_COMPLEMENT



/* Version number of package */

#define VERSION "0.2.6.4-rc-dev"

#define VERSION "0.2.6.5-rc"