Merge branch 'maint-0.4.5' into maint-0.4.6

diff --cc src/core/or/protover.c
Simple merge

diff --cc src/core/or/protover.h
Simple merge

diff --cc src/feature/dirauth/dirvote.c
Simple merge

diff --cc src/feature/dirauth/dirvote.h
index d6a2d9cc7510a240a19413a3bbcb6fa6a9856f9d,81a7733e8c401a55fba28790d74506e45dd6a6cb..34200983151abd62abe12be3978f7979c2b4b890
--- 1/src/feature/dirauth/dirvote.h
--- 2/src/feature/dirauth/dirvote.h
+++ b/src/feature/dirauth/dirvote.h
@@@ -264,68 -259,7 +264,10 @@@ STATI
  char *networkstatus_get_detached_signatures(smartlist_t *consensuses);
  STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri,
                                                     int consensus_method);
 +STATIC int64_t extract_param_buggy(const char *params,
 +                                   const char *param_name,
 +                                   int64_t default_value);
  
- /** The recommended relay protocols for this authority's votes.
-  * Recommending a new protocol causes old tor versions to log a warning.
-  */
- #define DIRVOTE_RECOMMEND_RELAY_PROTO           \
-   "Cons=2 "                                     \
-   "Desc=2 "                                     \
-   "DirCache=2 "                                 \
-   "HSDir=2 "                                    \
-   "HSIntro=4 "                                  \
-   "HSRend=2 "                                   \
-   "Link=4-5 "                                   \
-   "LinkAuth=3 "                                 \
-   "Microdesc=2 "                                \
-   "Relay=2"
- 
- /** The recommended client protocols for this authority's votes.
-  * Recommending a new protocol causes old tor versions to log a warning.
-  */
- #define DIRVOTE_RECOMMEND_CLIENT_PROTO          \
-   "Cons=2 "                                     \
-   "Desc=2 "                                     \
-   "DirCache=2 "                                 \
-   "HSDir=2 "                                    \
-   "HSIntro=4 "                                  \
-   "HSRend=2 "                                   \
-   "Link=4-5 "                                   \
-   "Microdesc=2 "                                \
-   "Relay=2"
- 
- /** The required relay protocols for this authority's votes.
-  * WARNING: Requiring a new protocol causes old tor versions to shut down.
-  *          Requiring the wrong protocols can break the tor network.
-  * See Proposal 303: When and how to remove support for protocol versions.
-  */
- #define DIRVOTE_REQUIRE_RELAY_PROTO             \
-   "Cons=2 "                                     \
-   "Desc=2 "                                     \
-   "DirCache=2 "                                 \
-   "HSDir=2 "                                    \
-   "HSIntro=4 "                                  \
-   "HSRend=2 "                                   \
-   "Link=4-5 "                                   \
-   "LinkAuth=3 "                                 \
-   "Microdesc=2 "                                \
-   "Relay=2"
- 
- /** The required relay protocols for this authority's votes.
-  * WARNING: Requiring a new protocol causes old tor versions to shut down.
-  *          Requiring the wrong protocols can break the tor network.
-  * See Proposal 303: When and how to remove support for protocol versions.
-  */
- #define DIRVOTE_REQUIRE_CLIENT_PROTO            \
-   "Cons=2 "                                     \
-   "Desc=2 "                                     \
-   "Link=4 "                                     \
-   "Microdesc=2 "                                \
-   "Relay=2"
- 
  #endif /* defined(DIRVOTE_PRIVATE) */
  
  #endif /* !defined(TOR_DIRVOTE_H) */

diff --cc src/test/test_protover.c
Simple merge